Fix for SH-2560: Nearby avatar textures fail to load; By Bao Linden

Tue, 13 Dec 2011 21:27:01 +0100

author
Ansariel
date
Tue, 13 Dec 2011 21:27:01 +0100
changeset 1603
ba54cca59700
parent 1600
b2e9fcf499c5
child 1604
4c9bc5da3f18

Fix for SH-2560: Nearby avatar textures fail to load; By Bao Linden

indra/newview/llviewertexture.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llviewertexture.cpp	Tue Dec 13 16:39:11 2011 +0100
     1.2 +++ b/indra/newview/llviewertexture.cpp	Tue Dec 13 21:27:01 2011 +0100
     1.3 @@ -2134,6 +2134,7 @@
     1.4  	if (!callback_list)
     1.5  	{
     1.6  		mPauseLoadedCallBacks = FALSE;
     1.7 +		mLastCallBackActiveTime = sCurrentTime;
     1.8  		return;
     1.9  	}
    1.10  
    1.11 @@ -2498,7 +2499,11 @@
    1.12  
    1.13  void LLViewerFetchedTexture::destroyRawImage()
    1.14  {	
    1.15 -	if (mAuxRawImage.notNull()) sAuxCount--;
    1.16 +	if (mAuxRawImage.notNull())
    1.17 +	{
    1.18 +		sAuxCount--;
    1.19 +		mAuxRawImage = NULL;
    1.20 +	}
    1.21  
    1.22  	if (mRawImage.notNull()) 
    1.23  	{
    1.24 @@ -2512,12 +2517,11 @@
    1.25  			}		
    1.26  			setCachedRawImage();
    1.27  		}
    1.28 +		mRawImage = NULL;
    1.29 +
    1.30 +		mIsRawImageValid = FALSE;
    1.31 +		mRawDiscardLevel = INVALID_DISCARD_LEVEL;
    1.32  	}
    1.33 -
    1.34 -	mRawImage = NULL;
    1.35 -	mAuxRawImage = NULL;
    1.36 -	mIsRawImageValid = FALSE;
    1.37 -	mRawDiscardLevel = INVALID_DISCARD_LEVEL;
    1.38  }
    1.39  
    1.40  //use the mCachedRawImage to (re)generate the gl texture.

mercurial