Commits

BaoLinden committed 5dfd331

fix for SH-2512: Some avatar textures in welcome area never load on first visit

  • Participants
  • Parent commits 6bfd46e

Comments (0)

Files changed (1)

indra/newview/llviewertexture.cpp

 
 bool LLViewerFetchedTexture::doLoadedCallbacks()
 {
-	static const F32 MAX_INACTIVE_TIME = 120.f ; //seconds
-
+	static const F32 MAX_INACTIVE_TIME = 900.f ; //seconds
+
+	if (mNeedsCreateTexture)
+	{
+		return false;
+	}
 	if(mPauseLoadedCallBacks)
 	{
 		destroyRawImage();
 		return false; //paused
-	}
-	if (mNeedsCreateTexture)
-	{
-		return false;
-	}
-	if(sCurrentTime - mLastCallBackActiveTime > MAX_INACTIVE_TIME)
+	}	
+	if(sCurrentTime - mLastCallBackActiveTime > MAX_INACTIVE_TIME && !mIsFetching)
 	{
 		clearCallbackEntryList() ; //remove all callbacks.
 		return false ;
 
 		// Remove ourself from the global list of textures with callbacks
 		gTextureList.mCallbackList.erase(this);
+		return false ;
 	}	
 
 	S32 gl_discard = getDiscardLevel();