summaryrefslogtreecommitdiff
path: root/indra/llimage/llimageworker.cpp
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2014-03-27 19:15:08 +0200
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2014-03-27 19:15:08 +0200
commit8fa339612681ef501a3c74db8e5845cbfffbf2b8 (patch)
treef54fb2e13d3743184728244505da1cad6b730b33 /indra/llimage/llimageworker.cpp
parent5c20e06dbd0845e2d45daae610c43fc89e24028f (diff)
MAINT-3827 FIXED crash in KDU texture decoding, likely out of memory: improving stability
Diffstat (limited to 'indra/llimage/llimageworker.cpp')
-rwxr-xr-xindra/llimage/llimageworker.cpp4
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;