diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-22 16:12:41 -0700 |
| commit | 18b7ab0018695e261dbc5058d76f9d371958b034 (patch) | |
| tree | 9b4baa5a5ca563ace1b06ac6b3df9fd9c0a0d0f7 /indra/newview/lltexturefetch.cpp | |
| parent | 60c4621500e478d66a8bdc3a1c80573be2860fee (diff) | |
| parent | be139dfb957e1b0d3c59110284c43630d3b57d23 (diff) | |
Weekly automated 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 } |