diff options
| author | callum <none@none> | 2009-11-24 14:36:57 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-24 14:36:57 -0800 |
| commit | fd74ba5467967cbdb5f7aca8b476080c66df2cd2 (patch) | |
| tree | fac520db60d0b08aea8b803571a04c1a8037803d /indra/newview/lltexturefetch.cpp | |
| parent | b0a31eaaee10b92df9e5aa80ccfeb25c5e797ac1 (diff) | |
| parent | fa88f41cccb9aeb5ccfdafbf5da5b34b72be1108 (diff) | |
Merge to tip
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 6f3dabe5a7..9bb2a4ad0a 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -931,6 +931,14 @@ bool LLTextureFetchWorker::doWork(S32 param) if (mState == DECODE_IMAGE) { + if (mDesiredDiscard < 0) + { + // We aborted, don't decode + mState = DONE; + setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); + return true; + } + if (mFormattedImage->getDataSize() <= 0) { llerrs << "Decode entered with invalid mFormattedImage. ID = " << mID << llendl; |