diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-15 14:46:00 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-15 14:46:00 -0800 |
| commit | 88a146e0bb95476792d0fabedab6d7a41c350949 (patch) | |
| tree | 4073dd4dfd872d25d1f47e4f9b9b30e95fdfa1c6 /indra/newview | |
| parent | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (diff) | |
| parent | 710d2a6db367e0bc57b098f8ceced68b533674de (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 85259fdc1e..9f69ed3964 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -887,6 +887,8 @@ bool LLTextureFetchWorker::doWork(S32 param) } else { + // mFormattedImage gauranteed to not be NULL since cur_size != 0 + mLoadedDiscard = mFormattedImage->getDiscardLevel(); mState = DECODE_IMAGE; return false; // use what we have } |