merge.

1 files changed, 8 insertions, 2 deletions

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index eaef93a81d..d8918bdb73 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;
 	}
-	llassert((mImageList.insert(image)).second == true) ;
+	if((mImageList.insert(image)).second != true) 
+	{
+		llerrs << "Error happens when insert image to mImageList!" << llendl ;
+	}
 	
 	image->setInImageList(TRUE) ;
 }
@@ -520,7 +523,10 @@ void LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *image)
 		}
 		llerrs << "LLViewerTextureList::removeImageFromList - Image not in list" << llendl;
 	}
-	llassert(mImageList.erase(image) == 1) ;
+	if(mImageList.erase(image) != 1) 
+	{
+		llerrs << "Error happens when remove image from mImageList!" << llendl ;
+	}
       
 	image->setInImageList(FALSE) ;
 }