diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-12 12:05:51 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-12 12:05:51 -0800 |
| commit | 426aca61d3c00d57d7066fb1ca5a7be8d138542e (patch) | |
| tree | 8ab65d462f97bbd3ab5104c8b4d3ea497866e77a /indra/newview/lltexturefetch.cpp | |
| parent | c61cb61ecc6beca1560a93cdad4ed1bc055c57f9 (diff) | |
| parent | 01d462482189abe18a52c293315ab536287b599a (diff) | |
Merge
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; |