diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2012-01-04 14:15:05 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2012-01-04 14:15:05 -0700 |
| commit | 4405910caa34446a19f66cfc35a9270a0e14292f (patch) | |
| tree | 23e41968b44d5ac7aaffdfe02d2c5c0ddf6f95f7 /indra/newview | |
| parent | a3e30250e8dc16d976e1df5d50bfdca28aec6d7e (diff) | |
| parent | 94ad019ce3387b9c5207fe3207933697059dd2dd (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index cddf7dcfea..089f45ca89 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -534,6 +534,7 @@ void LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *image) S32 count = mImageList.erase(image) ; if(count != 1) { + llinfos << image->getID() << llendl ; llerrs << "Error happens when remove image from mImageList: " << count << llendl ; } @@ -919,6 +920,8 @@ void LLViewerTextureList::decodeAllImages(F32 max_time) image_list.push_back(imagep); imagep->setInImageList(FALSE) ; } + + llassert_always(image_list.size() == mImageList.size()) ; mImageList.clear(); for (std::vector<LLPointer<LLViewerFetchedTexture> >::iterator iter = image_list.begin(); iter != image_list.end(); ++iter) |