summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-03-24 16:51:07 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-03-24 16:51:07 -0700
commitda407e32fdb68e5aecff99c970d654293e21d0d9 (patch)
tree95ed03c2d77c1ef2920cd940345f70ab32bcf97d /indra/newview/lltexturefetch.cpp
parent7480e069349e2b3a7581267d13f52c63e459af64 (diff)
parent7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff)
Merge
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-rw-r--r--indra/newview/lltexturefetch.cpp2
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
}