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

SH-4611 WIP - this should prevent the case logged, which I believe is caused when cache loading fails. Can not repro so somewhat speculative.

master
Brad Payne (Vir Linden) 2013-12-05 13:24:38 -05:00
parent 744cf6be8d
commit 4724232abd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/lltexturefetch.cpp
View File

@ -1612,7 +1612,10 @@ bool LLTextureFetchWorker::doWork(S32 param)
<< llendl;
}
mUrl.clear();
if (mFTType != FTT_SERVER_BAKE)
{
mUrl.clear();
}
if (cur_size > 0)
{
// Use available data
@ -1639,7 +1642,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
// Clear the url since we're done with the fetch
// Note: mUrl is used to check is fetching is required so failure to clear it will force an http fetch
// next time the texture is requested, even if the data have already been fetched.
if(mWriteToCacheState != NOT_WRITE)
if(mWriteToCacheState != NOT_WRITE && mFTType != FTT_SERVER_BAKE)
{
// Why do we want to keep url if NOT_WRITE - is this a proxy for map tiles?
mUrl.clear();