diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
| commit | 073ec70829723e54f822052fe9c6c3e998e8dfca (patch) | |
| tree | 3d7e782101a2284bcb0fcbf61273f8167d03544f /indra/newview/lltexturefetch.cpp | |
| parent | 4d4406820b858d59be670f0ca03bdadefba61c53 (diff) | |
| parent | e7eae453908e77a959a2ef6fea272107491fe35e (diff) | |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/lltexturefetch.cpp')
| -rw-r--r-- | indra/newview/lltexturefetch.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index e29c96bec4..9f69ed3964 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -43,8 +43,10 @@ #include "llhttpclient.h" #include "llhttpstatuscodes.h" #include "llimage.h" +#include "llimagej2c.h" #include "llimageworker.h" #include "llworkerthread.h" +#include "message.h" #include "llagent.h" #include "lltexturecache.h" @@ -885,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 } |