diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-12 04:50:04 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-12 04:50:04 +0000 |
| commit | 5d7d6824f54cb7a6758d519b4bb1c06e6f7915fd (patch) | |
| tree | e974e71c132a660353fa7e81a72771be31951697 /indra/newview/lltexturefetch.cpp | |
| parent | 773e8eb8ea3acc75b0e8137412458f77effffb70 (diff) | |
| parent | b4c13247f7a31eb88586a04b5c661254931de5fd (diff) | |
merge from viewer2 trunk.
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 4a61130785..6dcf4bc798 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -982,7 +982,12 @@ bool LLTextureFetchWorker::doWork(S32 param) } if (mLoadedDiscard < 0) { - llerrs << "Decode entered with invalid mLoadedDiscard. ID = " << mID << llendl; + //llerrs << "Decode entered with invalid mLoadedDiscard. ID = " << mID << llendl; + + //abort, don't decode + mState = DONE; + setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); + return true; } setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it mRawImage = NULL; |