From 4bab66a4b8982ca6cd0685f9f5ec6ce210d658cf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 9 Apr 2021 23:31:51 +0300
Subject: SL-15100 Crash rebulding faces #2

All preRebuild crashes appear to be LLVolumeImplFlexible
---
 indra/newview/llflexibleobject.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index e075a311c2..a24d1d1436 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -734,11 +734,14 @@ void LLVolumeImplFlexible::preRebuild()
 void LLVolumeImplFlexible::doFlexibleRebuild(bool rebuild_volume)
 {
 	LLVolume* volume = mVO->getVolume();
-	if(rebuild_volume)
-	{
-		volume->setDirty();
-	}
-	volume->regen();
+    if (volume)
+    {
+        if (rebuild_volume)
+        {
+            volume->setDirty();
+        }
+        volume->regen();
+    }
 	
 	mUpdated = TRUE;
 }
-- 
cgit v1.2.3