aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexturecache.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:30 -0500
committerJacek Antonelli2008-08-15 23:45:30 -0500
commit6fa6022a3f6d5bf71d97a59ec89929575f2ffd11 (patch)
tree3d1f89612dab6f8a8089ccac8cfeb6372f6fad8c /linden/indra/newview/lltexturecache.cpp
parentSecond Life viewer sources 1.19.0.2 (diff)
downloadmeta-impy-6fa6022a3f6d5bf71d97a59ec89929575f2ffd11.zip
meta-impy-6fa6022a3f6d5bf71d97a59ec89929575f2ffd11.tar.gz
meta-impy-6fa6022a3f6d5bf71d97a59ec89929575f2ffd11.tar.bz2
meta-impy-6fa6022a3f6d5bf71d97a59ec89929575f2ffd11.tar.xz
Second Life viewer sources 1.19.0.3
Diffstat (limited to 'linden/indra/newview/lltexturecache.cpp')
-rw-r--r--linden/indra/newview/lltexturecache.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 59d50d2..11fd348 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -492,7 +492,11 @@ bool LLTextureCacheWorker::doWrite()
492 idx = mCache->getHeaderCacheEntry(mID, true, &mImageSize); // touch entry 492 idx = mCache->getHeaderCacheEntry(mID, true, &mImageSize); // touch entry
493 if (idx >= 0) 493 if (idx >= 0)
494 { 494 {
495 llassert_always(cur_imagesize <= 0 || mImageSize == cur_imagesize); 495 if(cur_imagesize > 0 && mImageSize != cur_imagesize)
496 {
497 llwarns << "Header cache entry size: " << cur_imagesize << " != mImageSize: " << mImageSize << llendl;
498 offset = 0; // re-write header
499 }
496 mState = offset < TEXTURE_CACHE_ENTRY_SIZE ? HEADER : BODY; 500 mState = offset < TEXTURE_CACHE_ENTRY_SIZE ? HEADER : BODY;
497 } 501 }
498 else 502 else