diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-02-11 18:02:43 -0800 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-02-11 18:02:43 -0800 |
| commit | a5c725c189254388af06bdee7317774bc0264940 (patch) | |
| tree | 4860d9535b0d4e529c7799826bc5675e6f5348ba /indra/newview/lltexturefetch.cpp | |
| parent | f791d103c85fdb1a8b5f9f32365708915d1cfe74 (diff) | |
| parent | e0e82c908dd7aef7a0d3010be4bbc9fa1ac4d32a (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
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; |