From a0666bdb70ebb6c6838c22829a4d25b6c2b4e517 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
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/lltexlayer.cpp | 4 ++++
indra/newview/llviewertexture.cpp | 6 +++++-
indra/newview/llviewertexturelist.cpp | 5 ++++-
3 files changed, 13 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp
index 4a7d784c3e..84c8b9d5f0 100644
--- a/indra/newview/lltexlayer.cpp
+++ b/indra/newview/lltexlayer.cpp
@@ -1140,6 +1140,10 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea
BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable ) // This sets mInfo and calls initialization functions
{
//llassert(mInfo == NULL); // nyx says this is probably bogus but needs investigating
+ if (mInfo != NULL) // above llassert(), but softened into a warning
+ {
+ llwarns << "BAD STUFF! mInfo != NULL" << llendl;
+ }
mInfo = info;
//mID = info->mID; // No ID
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index ad993bc056..2544e46bab 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1560,7 +1560,11 @@ F32 LLViewerFetchedTexture::calcDecodePriority()
void LLViewerFetchedTexture::setDecodePriority(F32 priority)
{
- llassert(!mInImageList);
+ //llassert(!mInImageList); // firing a lot, figure out why
+ if (!mInImageList) // above llassert() softened to a warning
+ {
+ llwarns << "BAD STUFF! mInImageList" << llendl;
+ }
mDecodePriority = priority;
}
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