From a0666bdb70ebb6c6838c22829a4d25b6c2b4e517 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 21 Jan 2010 14:42:11 -0800 Subject: Turn on llassert() and llverify() for RelWithDebInfo builds. Convert top firing asserts into big warnings. To be reviewed by Mani. --- indra/newview/llviewertexturelist.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewertexturelist.cpp') diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 6bb547373c..e25ec8295c 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -519,7 +519,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) ; } -- cgit v1.2.3 From c510fed273864fcfe299d276e55a52916c989b5f Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 21 Jan 2010 15:39:19 -0800 Subject: Soften another common llassert() failure to a warning. --- indra/newview/llviewertexturelist.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewertexturelist.cpp') diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index e25ec8295c..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) ; } -- cgit v1.2.3