1 files changed, 39 insertions, 15 deletions

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index d64db19733..2efe4665fa 100755
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -561,38 +561,62 @@ void LLViewerTextureList::addImageToList(LLViewerFetchedTexture *image)
 	llassert_always(mInitialized) ;
 	llassert(image);
 	if (image->isInImageList())
-	{
-		llinfos << "LLViewerTextureList::addImageToList - Image already in list" << llendl;
+	{	// Flag is already set?
+		llwarns << "LLViewerTextureList::addImageToList - image " << image->getID()  << " already in list" << llendl;
 	}
+	else
+	{
 	if((mImageList.insert(image)).second != true) 
 	{
-		llinfos << "Error happens when insert image to mImageList!" << llendl ;
+			llwarns << "Error happens when insert image " << image->getID()  << " into mImageList!" << llendl ;
 	}
-	
 	image->setInImageList(TRUE) ;
 }
+}
 
 void LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *image)
 {
 	assert_main_thread();
 	llassert_always(mInitialized) ;
 	llassert(image);
-	if (!image->isInImageList())
+
+	S32 count = 0;
+	if (image->isInImageList())
+	{
+		count = mImageList.erase(image) ;
+		if(count != 1) 
 	{
-		llinfos << "RefCount: " << image->getNumRefs() << llendl ;
+			llinfos << "Image  " << image->getID() 
+				<< " had mInImageList set but mImageList.erase() returned " << count
+				<< llendl;
+		}
+	}
+	else
+	{	// Something is wrong, image is expected in list or callers should check first
+		llinfos << "Calling removeImageFromList() for " << image->getID() 
+			<< " but doesn't have mInImageList set"
+			<< " ref count is " << image->getNumRefs()
+			<< llendl;
 		uuid_map_t::iterator iter = mUUIDMap.find(image->getID());
-		if(iter == mUUIDMap.end() || iter->second != image)
+		if(iter == mUUIDMap.end())
 		{
-			llinfos << "Image is not in mUUIDMap!" << llendl ;
+			llinfos << "Image  " << image->getID() << " is also not in mUUIDMap!" << llendl ;
 		}
-		llinfos << "LLViewerTextureList::removeImageFromList - Image not in list" << llendl;
+		else if (iter->second != image)
+		{
+			llinfos << "Image  " << image->getID() << " was in mUUIDMap but with different pointer" << llendl ;
 	}
-
-	S32 count = mImageList.erase(image) ;
-	llassert(count == 1);
-	if(count != 1) 
+		else
 	{
-		llinfos << image->getID() << " removed with non-one count of " << count << llendl;
+			llinfos << "Image  " << image->getID() << " was in mUUIDMap with same pointer" << llendl ;
+		}
+		count = mImageList.erase(image) ;
+		if(count != 0) 
+		{	// it was in the list already?
+			llwarns << "Image  " << image->getID() 
+				<< " had mInImageList false but mImageList.erase() returned " << count
+				<< llendl;
+		}
 	}
       
 	image->setInImageList(FALSE) ;
@@ -1281,7 +1305,7 @@ S32 LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, float mem_m
 		max_texmem = llmin(max_texmem, (S32)(system_ram/2));
 	else
 		max_texmem = llmin(max_texmem, (S32)(system_ram));
-		
+    
     // limit the texture memory to a multiple of the default if we've found some cards to behave poorly otherwise
 	max_texmem = llmin(max_texmem, (S32) (mem_multiplier * (F32) max_texmem));