diff options
| author | callum <none@none> | 2009-12-16 14:34:13 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-12-16 14:34:13 -0800 |
| commit | 17ea8bfa9ea69b1022d0f8754732c479fe5a7f6b (patch) | |
| tree | c2b18373bad5e9856cf3edf226783c8767230559 /indra/newview/lltexturefetch.cpp | |
| parent | 828694987cce58b88143e3a2c5bd55a10e6afc24 (diff) | |
| parent | d3ca545687945054c666359e78ada94949732205 (diff) | |
Merge with tip
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 } |