diff options
author | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-03-23 23:02:02 -0400 |
commit | 62ebb4533ceff1d0a7cf68a6385a8d3b34fa51d4 (patch) | |
tree | dd6cd1b313f933847c6e603d50a65ffbc82fee01 /indra/newview/lltexturefetch.cpp | |
parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
parent | ea8f1b80df0fcfcdbb52123b2ece68916ed139ff (diff) |
Merge from viewer-2-0
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r-- | indra/newview/lltexturefetch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index b1b3ae473c..1c7b3a0fe0 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -571,7 +571,7 @@ bool LLTextureFetchWorker::doWork(S32 param) if ((mFetcher->isQuitting() || mImagePriority < 1.0f || getFlags(LLWorkerClass::WCF_DELETE_REQUESTED))) { - if (mState < WRITE_TO_CACHE) + if (mState < DECODE_IMAGE) { return true; // abort } |