summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturefetch.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-23 14:08:11 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-23 14:08:11 +0000
commite7d9999359dd62509c685181d620b092ed28bc60 (patch)
tree595bc367bef76b80d04f7e3e7d95dfbeb31a13cd /indra/newview/lltexturefetch.cpp
parent11e6e208d43f1347037fb312921a65af138f47b4 (diff)
parentaf77b7713444b9df58f451bdb1f30bdd4754fcbf (diff)
Merge from viewer-2-0
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
}