Backed out changeset: de0a65947c60

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;

indra/llimage/tests/llimageworker_test.cpp

@@ -58,7 +58,6 @@ void LLImageBase::sanityCheck() { }
 void LLImageBase::deleteData() { }
 U8* LLImageBase::allocateData(S32 size) { return NULL; }
 U8* LLImageBase::reallocateData(S32 size) { return NULL; }
-U8* LLImageBase::getData() { return NULL; }
 
 LLImageRaw::LLImageRaw(U16 width, U16 height, S8 components) { }
 LLImageRaw::~LLImageRaw() { }