Second Life viewer sources 1.20.3

1 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 4b357e2..188c277 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -762,7 +762,7 @@ void LLVOVolume::sculpt()
                         return;
                 
                 LLPointer<LLImageRaw> raw_image = new LLImageRaw();
-                mSculptTexture->readBackRaw(discard_level, raw_image, FALSE);
+                BOOL is_valid = mSculptTexture->readBackRaw(discard_level, raw_image, FALSE);
 
                 sculpt_height = raw_image->getHeight();
                 sculpt_width = raw_image->getWidth();
@@ -770,6 +770,16 @@ void LLVOVolume::sculpt()
                 sculpt_components = raw_image->getComponents();
                 sculpt_data = raw_image->getData();
 
+                if(is_valid)
+                {
+                        is_valid = mSculptTexture->isValidForSculpt(discard_level, sculpt_width, sculpt_height, sculpt_components) ;
+                }
+                if(!is_valid)
+                {
+                        sculpt_width = 0 ;
+                        sculpt_height = 0 ;
+                }
+
                 llassert_always(raw_image->getDataSize() >= sculpt_height * sculpt_width * sculpt_components);
 
                 getVolume()->sculpt(sculpt_width, sculpt_height, sculpt_components, sculpt_data, discard_level);