Second Life viewer sources 1.20.4

1 files changed, 12 insertions, 8 deletions

diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 188c277..6b5b9bb 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -766,9 +766,7 @@ void LLVOVolume::sculpt()
 
                 sculpt_height = raw_image->getHeight();
                 sculpt_width = raw_image->getWidth();
-
-                sculpt_components = raw_image->getComponents();
-                sculpt_data = raw_image->getData();
+                sculpt_components = raw_image->getComponents();         
 
                 if(is_valid)
                 {
@@ -776,12 +774,18 @@ void LLVOVolume::sculpt()
                 }
                 if(!is_valid)
                 {
-                        sculpt_width = 0 ;
-                        sculpt_height = 0 ;
+                        sculpt_width = 0;
+                        sculpt_height = 0;
+                        sculpt_data = NULL ;
+                }
+                else
+                {
+                        if (raw_image->getDataSize() < sculpt_height * sculpt_width * sculpt_components)
+                                llerrs << "Sculpt: image data size = " << raw_image->getDataSize()
+                                           << " < " << sculpt_height << " x " << sculpt_width << " x " <<sculpt_components << llendl;
+                                           
+                        sculpt_data = raw_image->getData();
                 }
-
-                llassert_always(raw_image->getDataSize() >= sculpt_height * sculpt_width * sculpt_components);
-
                 getVolume()->sculpt(sculpt_width, sculpt_height, sculpt_components, sculpt_data, discard_level);
         }
 }