diff options
author | skolb <none@none> | 2009-12-15 15:20:26 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-15 15:20:26 -0800 |
commit | eb6b69640ea70de0e3b848ec3a4af3eee098f19f (patch) | |
tree | 4cca458d120a9ede6174fa037e1a07294e9578a6 /indra/newview/lltexturefetch.cpp | |
parent | 90d7c2ec131117e0517a3a6c97927c7ae7f19a83 (diff) | |
parent | 1f8ad2651d82b81fc85d91f3d48663430427537e (diff) |
Merge
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
-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 } |