diff options
| author | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
| commit | eb5a76996a1b1ce2ef30b6106287caae998dcc85 (patch) | |
| tree | c796af5a77c8ebfa7d9d09709c0b179e721490c8 /indra/newview/lltexturefetch.cpp | |
| parent | 4e23ae312f0ab59c0c8c5b55c6c8450adf7d7f82 (diff) | |
| parent | 6f66ec64b9e360a002a6d658327b72aaaab9325a (diff) | |
Merge (viewer-2-0 into gooey)
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 |