summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-09 23:31:51 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-09 23:31:51 +0300
commit4bab66a4b8982ca6cd0685f9f5ec6ce210d658cf (patch)
tree9de60420d162dc6484c88ca09f696823ea6c2962 /indra
parent52a8e6292cfbfd1d9b006eeeff74e5c4a6a687a8 (diff)
SL-15100 Crash rebulding faces #2
All preRebuild crashes appear to be LLVolumeImplFlexible
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llflexibleobject.cpp13
1 files 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;
}