From 794cc247e61805cc582926938287fe1ad370abca Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 23 Dec 2014 17:17:31 +0200
Subject: MAINT-4755 FIXED Asset on Screen Causes Sudden FPS Drop

---
 indra/llimage/llimageworker.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'indra/llimage')

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;
-- 
cgit v1.2.3