diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-22 16:28:45 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-22 16:28:45 +0200 |
| commit | 5f334e18b837493f9c6f7a62eb61f0aeec94d28b (patch) | |
| tree | 048347781b2f7adf0c1a20b2c2033400c7ab203b /indra/newview/llviewertexture.cpp | |
| parent | 7f42a0e8affe1a3394116d1457830f774deb7438 (diff) | |
| parent | 1fb9389822405bae537d7203cd56ffee5f717664 (diff) | |
merge
--HG--
branch : product-engine
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; } |