Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

1 files changed, 4 insertions, 8 deletions

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