summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2014-12-23 17:17:31 +0200
committerandreykproductengine <akleshchev@productengine.com>2014-12-23 17:17:31 +0200
commit794cc247e61805cc582926938287fe1ad370abca (patch)
tree7e66ca139bc7aae314fc1b6578387ed44621c633 /indra
parent13b119435dc7bd36ead4ea9f06db45e185ae61fd (diff)
MAINT-4755 FIXED Asset on Screen Causes Sudden FPS Drop
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llimage/llimageworker.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp
index c8b0e872f6..4875fe7001 100755
--- a/indra/llimage/llimageworker.cpp
+++ b/indra/llimage/llimageworker.cpp
@@ -143,7 +143,8 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
mFormattedImage->getComponents());
}
done = mFormattedImage->decode(mDecodedImageRaw, decode_time_slice); // 1ms
- mDecodedRaw = done;
+ // some decoders are removing data when task is complete and there were errors
+ mDecodedRaw = done && mDecodedImageRaw->getData();
}
if (done && mNeedsAux && !mDecodedAux && mFormattedImage.notNull())
{
@@ -155,7 +156,7 @@ bool LLImageDecodeThread::ImageRequest::processRequest()
1);
}
done = mFormattedImage->decodeChannels(mDecodedImageAux, decode_time_slice, 4, 4); // 1ms
- mDecodedAux = done;
+ mDecodedAux = done && mDecodedImageAux->getData();
}
return done;