diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-24 17:36:41 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-24 17:36:41 +0200 |
| commit | 268e4854c056170b4703e341e7e9d02f332d61d4 (patch) | |
| tree | c5e75a1e3eed76679cc856e4b397aa11f4986cd6 /indra/newview/lltexturefetch.cpp | |
| parent | c4a10e9a53bd8f55b63b28783fa3758c21f6a122 (diff) | |
| parent | 76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (diff) | |
Merge from default branch
--HG--
branch : product-engine
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; |