QAR-449 Viewer 1.20 RC 0

merge Branch_1-20-Viewer -r 84060 : 84432 -> release

1 files changed, 17 insertions, 1 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 2b8cf93b2d..ce4a660682 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -741,7 +741,23 @@ void LLVOVolume::sculpt()
 
 		
 		S32 current_discard = getVolume()->getSculptLevel();
-		llassert_always(current_discard >= -2 && current_discard <= max_discard);
+		if(current_discard < -2)
+		{
+			llwarns << "WARNING!!: Current discard of sculpty at " << current_discard 
+				<< " is less than -2." << llendl;
+			
+			// corrupted volume... don't update the sculpty
+			return;
+		}
+		else if (current_discard > max_discard)
+		{
+			llwarns << "WARNING!!: Current discard of sculpty at " << current_discard 
+				<< " is more than than allowed max of " << max_discard << llendl;
+			
+			// corrupted volume... don't update the sculpty			
+			return;
+		}
+
 		if (current_discard == discard_level)  // no work to do here
 			return;