livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for SH-2560: Nearby avatar textures fail to load 

and SH-2671: sometimes other avatar textures don't load
meow-7.2.2
Xiaohong Bao 2011-12-01 12:06:47 -07:00
parent 6c34646aa9
commit 8aa0ef2636
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
indra/newview/llviewertexture.cpp
View File

@ -2269,6 +2269,7 @@ void LLViewerFetchedTexture::unpauseLoadedCallbacks(const LLLoadedCallbackEntry:
}
}
mPauseLoadedCallBacks = FALSE ;
mLastCallBackActiveTime = sCurrentTime ;
if(need_raw)
{
mSaveRawImage = TRUE ;
@ -2310,6 +2311,11 @@ bool LLViewerFetchedTexture::doLoadedCallbacks()
{
static const F32 MAX_INACTIVE_TIME = 120.f ; //seconds
if(mPauseLoadedCallBacks)
{
destroyRawImage();
return false; //paused
}
if (mNeedsCreateTexture)
{
return false;
@ -2337,12 +2343,7 @@ bool LLViewerFetchedTexture::doLoadedCallbacks()
// Remove ourself from the global list of textures with callbacks
gTextureList.mCallbackList.erase(this);
}
if(mPauseLoadedCallBacks)
{
destroyRawImage();
return res; //paused
}
}
S32 gl_discard = getDiscardLevel();
@ -2604,7 +2605,11 @@ bool LLViewerFetchedTexture::needsToSaveRawImage()
void LLViewerFetchedTexture::destroyRawImage()
{
if (mAuxRawImage.notNull()) sAuxCount--;
if (mAuxRawImage.notNull())
{
sAuxCount--;
mAuxRawImage = NULL;
}
if (mRawImage.notNull())
{
@ -2618,12 +2623,12 @@ void LLViewerFetchedTexture::destroyRawImage()
}
setCachedRawImage() ;
}
mRawImage = NULL;
mIsRawImageValid = FALSE;
mRawDiscardLevel = INVALID_DISCARD_LEVEL;
}
mRawImage = NULL;
mAuxRawImage = NULL;
mIsRawImageValid = FALSE;
mRawDiscardLevel = INVALID_DISCARD_LEVEL;
}
//use the mCachedRawImage to (re)generate the gl texture.