merge

1 files changed, 8 insertions, 3 deletions

diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp
index 86d41515e7..20a72d0a28 100644
--- a/indra/llimage/llimageworker.cpp
+++ b/indra/llimage/llimageworker.cpp
@@ -54,9 +54,14 @@ S32 LLImageDecodeThread::update(U32 max_time_ms)
 	{
 		creation_info& info = *iter;
 		ImageRequest* req = new ImageRequest(info.handle, info.image,
-											 info.priority, info.discard, info.needs_aux,
-											 info.responder);
-		addRequest(req);
+						     info.priority, info.discard, info.needs_aux,
+						     info.responder);
+
+		bool res = addRequest(req);
+		if (!res)
+		{
+			llerrs << "request added after LLLFSThread::cleanupClass()" << llendl;
+		}
 	}
 	mCreationList.clear();
 	S32 res = LLQueuedThread::update(max_time_ms);