1 files changed, 8 insertions, 8 deletions

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index e2bc11ea1c..ec7eca3bb2 100755
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -555,11 +555,11 @@ void LLViewerTextureList::addImageToList(LLViewerFetchedTexture *image)
 	llassert(image);
 	if (image->isInImageList())
 	{
-		LL_ERRS() << "LLViewerTextureList::addImageToList - Image already in list" << LL_ENDL;
+		LL_INFOS() << "LLViewerTextureList::addImageToList - Image already in list" << LL_ENDL;
 	}
 	if((mImageList.insert(image)).second != true) 
 	{
-		LL_ERRS() << "Error happens when insert image to mImageList!" << LL_ENDL ;
+		LL_INFOS() << "Error happens when insert image to mImageList!" << LL_ENDL ;
 	}
 	
 	image->setInImageList(TRUE) ;
@@ -578,14 +578,14 @@ void LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *image)
 		{
 			LL_INFOS() << "Image is not in mUUIDMap!" << LL_ENDL ;
 		}
-		LL_ERRS() << "LLViewerTextureList::removeImageFromList - Image not in list" << LL_ENDL;
+		LL_INFOS() << "LLViewerTextureList::removeImageFromList - Image not in list" << LL_ENDL;
 	}
 
 	S32 count = mImageList.erase(image) ;
+	llassert(count == 1);
 	if(count != 1) 
 	{
-		LL_INFOS() << image->getID() << LL_ENDL ;
-		LL_ERRS() << "Error happens when remove image from mImageList: " << count << LL_ENDL ;
+		LL_INFOS() << image->getID() << " removed with non-one count of " << count << LL_ENDL;
 	}
       
 	image->setInImageList(FALSE) ;
@@ -595,15 +595,15 @@ void LLViewerTextureList::addImage(LLViewerFetchedTexture *new_image)
 {
 	if (!new_image)
 	{
-		LL_WARNS() << "No image to add to image list" << LL_ENDL;
 		return;
 	}
+	llassert(new_image);
 	LLUUID image_id = new_image->getID();
 	
 	LLViewerFetchedTexture *image = findImage(image_id);
 	if (image)
 	{
-		LL_WARNS() << "Image with ID " << image_id << " already in list" << LL_ENDL;
+		LL_INFOS() << "Image with ID " << image_id << " already in list" << LL_ENDL;
 	}
 	sNumImages++;
 	
@@ -1290,7 +1290,7 @@ S32Megabytes LLViewerTextureList::getMaxVideoRamSetting(bool get_recommended, fl
 		max_texmem = llmin(max_texmem, system_ram/2);
 	else
 		max_texmem = llmin(max_texmem, 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, (S32Megabytes) (mem_multiplier * max_texmem));