Partial fix #772: Large sculpt maps are deformed

This is a partial fix for cases where the sculpt map is larger than
128x128, like in some old sculpted trees. This was done by content
creators to beat bugs in old viewers. The sculpties still need a lod
change to trigger a rebuild once they are fully decoded, and that doesn't
always happen, because we abuse RenderVolumeLODFactor.

Ported from Snowglobe2 (GPL)

1 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 671a359..a600dc5 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -1759,13 +1759,19 @@ void LLViewerImage::setCachedRawImage()
                 if(mForSculpt)
                 {
                         max_size = MAX_CACHED_RAW_SCULPT_IMAGE_AREA ;
+                        // Even though we don't use the full pixel size, we want to decode up to discard 0,
+                        // because some legacy sculpts are weird like that.
+                        mCachedRawImageReady = !mRawDiscardLevel ;
+                }
+                else
+                {
+                        mCachedRawImageReady = (!mRawDiscardLevel || ((w * h) >= max_size)) ;
                 }
 
                 while(((w >> i) * (h >> i)) > max_size)
                 {
                         ++i ;
                 }
-                mCachedRawImageReady = (!mRawDiscardLevel || ((w * h) >= max_size)) ;
                 
                 if(i)
                 {
@@ -1776,7 +1782,8 @@ void LLViewerImage::setCachedRawImage()
                         mRawImage->scale(w >> i, h >> i) ;
                 }
                 mCachedRawImage = mRawImage ;
-                mCachedRawDiscardLevel = mRawDiscardLevel + i ;                 
+                mRawDiscardLevel += i ;
+                mCachedRawDiscardLevel = mRawDiscardLevel ;                     
         }
 }
 
@@ -1784,7 +1791,7 @@ void LLViewerImage::checkCachedRawSculptImage()
 {
         if(mCachedRawImageReady && mCachedRawDiscardLevel > 0)
         {
-                if(mCachedRawImage->getWidth() * mCachedRawImage->getHeight() < MAX_CACHED_RAW_SCULPT_IMAGE_AREA)
+                if(getDiscardLevel() != 0)
                 {
                         mCachedRawImageReady = FALSE ;
                 }