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

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

meow-7.2.2
Xiaohong Bao 2011-12-02 14:58:33 -07:00
parent 70b47839f3
commit 8f0f480612
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llviewertexture.cpp
View File

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