From 254db516c5db2bd2eda3329c1fae59df2e0510aa Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 24 Feb 2010 12:09:22 -0700 Subject: fix for EXT-5710: improve the raw image reloading process in the texture pipeline; EXT-4612: failing assert LLViewerTexture::setDecodePriority: ASSERT (!mInImageList); EXT-4912: Texture alpha mask is not applied on the first frame after decode. --- indra/newview/llviewertexturelist.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'indra/newview/llviewertexturelist.cpp') 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) ; } -- cgit v1.3 From 7b2e66b4d9200e67c8aa62e0e9dd749ee5e6e4e0 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Sat, 27 Feb 2010 23:08:35 -0700 Subject: fix for EXT-5869: some UI textures loading delayed or broken in Release mode. --- indra/newview/llviewertexturelist.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewertexturelist.cpp') 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) ; } -- cgit v1.3