Only check if an object is above SculptSAThresh if it's an actual sculptie

2 files changed, 11 insertions, 4 deletions

diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 50f8ba5..def847b 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -87,6 +87,7 @@
                                                         <!--<string>VOAvatar</string>-->
                                                         <!--<string>View</string>-->
                                                         <!--<string>ViewerImages</string>-->
+              <!--<string>Volume</string>-->
               <!--<string>TextureCache</string>-->
               <!--<string>Throttle</string>-->
                                                         <!--<string>Voice</string>-->
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 8d5bfb4..77201da 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -2308,16 +2308,22 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 
                 LLVOVolume* vobj = drawablep->getVOVolume();
 
-                if (vobj->mSculptSurfaceArea > sSculptSAThresh)
+                llassert_always(vobj);
+
+                if (vobj->isSculpted() && vobj->mSculptSurfaceArea > sSculptSAThresh)
                 {
                     LLPipeline::sSculptSurfaceAreaFrame += vobj->mSculptSurfaceArea;
-                    if(LLPipeline::sSculptSurfaceAreaFrame > sSculptSAMax)
+                    if (LLPipeline::sSculptSurfaceAreaFrame > sSculptSAMax)
                     {
-                      continue;
+                                LL_DEBUGS("Volume") << "Sculptie (" 
+                                                                        << vobj->getID() << ") above RenderSculptSAMax ("
+                                                                        << sSculptSAMax
+                                                                        << ")! Turning invisible!" 
+                                                                        << LL_ENDL;
+                                continue;
                     }
                 }
                 
-                llassert_always(vobj);
                 vobj->updateTextureVirtualSize();
                 vobj->preRebuild();