diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
commit | 1147cb1afbc21e1251614895844e95bca9b6b5bc (patch) | |
tree | da01f6c0e6b61a7c0637a371c946ea69b46f9dff /indra/newview/llviewertexturelist.cpp | |
parent | b11a625e6ff89470d25273fa426ed13f7abc4a6a (diff) | |
parent | 0600083891ab5b2c6a79097f65945bcb2d049bed (diff) |
Automated merge from trunk
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
-rw-r--r-- | indra/newview/llviewertexturelist.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index ee934ab9c5..d8918bdb73 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -502,10 +502,11 @@ void LLViewerTextureList::addImageToList(LLViewerFetchedTexture *image) { llerrs << "LLViewerTextureList::addImageToList - Image already in list" << llendl; } - if ((mImageList.insert(image)).second != true) + if((mImageList.insert(image)).second != true) { - llwarns << "BAD STUFF! (mImageList.insert(image)).second != true" << llendl; + llerrs << "Error happens when insert image to mImageList!" << llendl ; } + image->setInImageList(TRUE) ; } @@ -522,10 +523,11 @@ 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; - } + if(mImageList.erase(image) != 1) + { + llerrs << "Error happens when remove image from mImageList!" << llendl ; + } + image->setInImageList(FALSE) ; } |