diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-30 13:25:18 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-30 13:25:18 +0200 |
| commit | db482969ed69b16b1755599750dd2d80cb4daff8 (patch) | |
| tree | 70e6afc4826ee8e3e3cb7b36b6a5a0ff52b79f9a /indra/newview/lltexturefetch.cpp | |
| parent | 1febd28bd41f3ba0102a86da48f3098eebbbdb8a (diff) | |
| parent | f4e2287175ab1bc9d09fc73435a828071b9e2ba5 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index a75f631769..eeedf38543 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -962,6 +962,15 @@ bool LLTextureFetchWorker::doWork(S32 param) if (mState == DECODE_IMAGE) { + static LLCachedControl<bool> textures_decode_disabled(gSavedSettings,"TextureDecodeDisabled"); + if(textures_decode_disabled) + { + // for debug use, don't decode + mState = DONE; + setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); + return true; + } + if (mDesiredDiscard < 0) { // We aborted, don't decode |