merge

--HG--
branch : product-engine

1 files changed, 8 insertions, 2 deletions

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 6bb547373c..ee934ab9c5 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -502,7 +502,10 @@ void LLViewerTextureList::addImageToList(LLViewerFetchedTexture *image)
 	{
 		llerrs << "LLViewerTextureList::addImageToList - Image already in list" << llendl;
 	}
-	llverify((mImageList.insert(image)).second == true);
+	if ((mImageList.insert(image)).second != true)
+	{
+		llwarns << "BAD STUFF!  (mImageList.insert(image)).second != true" << llendl;
+	}
 	image->setInImageList(TRUE) ;
 }
 
@@ -519,7 +522,10 @@ void LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *image)
 		}
 		llerrs << "LLViewerTextureList::removeImageFromList - Image not in list" << llendl;
 	}
-	llverify(mImageList.erase(image) == 1);
+	if (mImageList.erase(image) != 1)
+        {
+                llwarns << "BAD STUFF!  mImageList.erase(image) != 1" << llendl;
+        }
 	image->setInImageList(FALSE) ;
 }