From 56ccf4d0befca4c98d1d13f757b515bde1d3e262 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 17 Mar 2010 16:41:28 -0600 Subject: fix for EXT-6420: crash at LLImageRaw::LLImageRaw [secondlife-bin llimage.cpp:271] --- indra/newview/llviewertexture.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'indra/newview/llviewertexture.cpp') diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 133b6ee8c9..dbbf0219c9 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2262,11 +2262,14 @@ void LLViewerFetchedTexture::destroyRawImage() { sRawCount--; - if(mForceToSaveRawImage) + if(mIsRawImageValid) { - saveRawImage() ; - } - setCachedRawImage() ; + if(mForceToSaveRawImage) + { + saveRawImage() ; + } + setCachedRawImage() ; + } } mRawImage = NULL; -- cgit v1.2.3 From 12a86042f726fbc9bba06103ed8c68bf954e6c6a Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 18 Mar 2010 22:07:25 -0600 Subject: fix for EXT-6465: sometimes the texture fetching queue is never empty. --- indra/newview/llviewertexture.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llviewertexture.cpp') diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index dbbf0219c9..9fbffdac35 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1546,8 +1546,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority() } else { - // Leave the priority as-is - return mDecodePriority; + priority = -1.f; //stop fetching } } else if (cur_discard < 0) -- cgit v1.2.3