diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-19 00:57:04 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-19 00:57:04 -0400 |
| commit | 141f2aa9ee5f71134c1ac13815b7e54092ee4756 (patch) | |
| tree | 521dcdefd4a260b68425b44498e190710de9c0d4 /indra | |
| parent | 599c2d7475382e234ead5c912c64cdfd9610db54 (diff) | |
| parent | 7b7114f7ac27b67c6e75d8f1ecc7596bc88c78de (diff) | |
Merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 3 |
2 files changed, 2 insertions, 3 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 } diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index dbbf0219c9..9fbffdac35 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1546,8 +1546,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority() } else { - // Leave the priority as-is - return mDecodePriority; + priority = -1.f; //stop fetching } } else if (cur_discard < 0) |