diff options
author | simon <none@none> | 2014-03-26 10:08:19 -0700 |
---|---|---|
committer | simon <none@none> | 2014-03-26 10:08:19 -0700 |
commit | 70006f4a5651ebaa0362ec2f95b5dda13f72e5c7 (patch) | |
tree | 6e1f7e8ccea28fa830bca7f2508a626f6ca907c9 /indra/llimage/llimageworker.cpp | |
parent | 73ef75498692e7b7cecb4960f4e308061917d86e (diff) | |
parent | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (diff) |
Pull in downstream -tiger, -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/llimage/llimageworker.cpp')
-rwxr-xr-x | indra/llimage/llimageworker.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index ad2eb0f69c..e425823c59 100755 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -142,8 +142,12 @@ bool LLImageDecodeThread::ImageRequest::processRequest() mFormattedImage->getHeight(), mFormattedImage->getComponents()); } - done = mFormattedImage->decode(mDecodedImageRaw, decode_time_slice); // 1ms - mDecodedRaw = done; + + //if (mDecodedImageRaw->getData())) + { + done = mFormattedImage->decode(mDecodedImageRaw, decode_time_slice); // 1ms + mDecodedRaw = done; + } } if (done && mNeedsAux && !mDecodedAux && mFormattedImage.notNull()) { @@ -154,8 +158,12 @@ bool LLImageDecodeThread::ImageRequest::processRequest() mFormattedImage->getHeight(), 1); } - done = mFormattedImage->decodeChannels(mDecodedImageAux, decode_time_slice, 4, 4); // 1ms - mDecodedAux = done; + + //if (mDecodedImageAux->getData()) + { + done = mFormattedImage->decodeChannels(mDecodedImageAux, decode_time_slice, 4, 4); // 1ms + mDecodedAux = done; + } } return done; |