diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 15:18:08 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-22 15:18:08 -0800 |
| commit | 9e0920df2c8ada63397ea6e439b02ee5b40d1bf6 (patch) | |
| tree | 26f6af13d1dcd9d02c48bd7897b3604481f3734c /indra/newview/llviewertexture.cpp | |
| parent | b96e52b72ab598a57d981c850b5f14b1ac406325 (diff) | |
| parent | 4cf79224d099c4fc8bdfd9617e95a776d5a028d4 (diff) | |
Merge from v2 trunk.
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 ee89a000ab..73dc9745cb 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; } |