diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-16 14:56:18 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-16 14:56:18 +0200 |
| commit | 734f37816ef35089bc0f5710dc1f9684bc5b9b69 (patch) | |
| tree | 38bcf9ca3bce50b9d0fba8b717b910bcbba638d7 /indra/newview/lltexturefetch.cpp | |
| parent | e398f41074f40c0779d7cc29a8127540ac78b1f9 (diff) | |
| parent | 88291b378eda6178ae3f2cbda60feddf0e68e3fa (diff) | |
Merge from default branch.
--HG--
branch : product-engine
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 } |