diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-22 14:55:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-22 14:55:39 -0500 |
| commit | 3b0ba0c2d7f48a5d1cf2adcbc87c9eaf4d8f6564 (patch) | |
| tree | dc2c080606407dc5f9f2c872d3dd40a465acecf8 /indra/newview/llviewertexture.cpp | |
| parent | 1f896d2d58d9c150d3981f253e81898afa999c2c (diff) | |
| parent | fa891c062ef66410123c66de1ef67b7dcef327db (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index ad993bc056..3f42cba561 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; } |