diff options
| author | simon <none@none> | 2014-04-01 18:45:13 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-01 18:45:13 -0700 |
| commit | 4026a6a4d67d6e079e92b0973942a1f896ae496e (patch) | |
| tree | f6edea5301905efca420cd5994efdb71c33819e5 /indra/llimage/llimageworker.cpp | |
| parent | e96fad30ac06f040099db2148a0f482641d1cbd4 (diff) | |
| parent | 565c41fdc2e2f8f9841cb41b446671563ea8d5e1 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/llimage/llimageworker.cpp')
| -rwxr-xr-x | indra/llimage/llimageworker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp index e425823c59..148cf4fa55 100755 --- a/indra/llimage/llimageworker.cpp +++ b/indra/llimage/llimageworker.cpp @@ -143,7 +143,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest() mFormattedImage->getComponents()); } - //if (mDecodedImageRaw->getData())) + if (mDecodedImageRaw->getData()) { done = mFormattedImage->decode(mDecodedImageRaw, decode_time_slice); // 1ms mDecodedRaw = done; @@ -159,7 +159,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest() 1); } - //if (mDecodedImageAux->getData()) + if (mDecodedImageAux->getData()) { done = mFormattedImage->decodeChannels(mDecodedImageAux, decode_time_slice, 4, 4); // 1ms mDecodedAux = done; |