summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-11-22 00:37:43 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-11-22 00:38:02 +0200
commit1fae237c158a8f501ae80d030b1a8cfdd8d2d8a2 (patch)
treed442d840034bab54e055d9c244d83b2db9d4a0b1 /indra/newview
parent649bfb52479bf0e72985cdb8752ed93fa5bb0b1e (diff)
SL-20610 Crash when unticking animesh on an attachment
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llspatialpartition.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index a3d8986c20..cafc82964c 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -868,10 +868,9 @@ void LLSpatialGroup::rebound()
LLControlAvatar* controlAvatar = bridge->mDrawable->getVObj()->getControlAvatar();
if (controlAvatar &&
controlAvatar->mDrawable &&
- controlAvatar->mControlAVBridge)
+ controlAvatar->mControlAVBridge &&
+ controlAvatar->mControlAVBridge->mOctree)
{
- llassert(controlAvatar->mControlAVBridge->mOctree);
-
LLSpatialGroup* root = (LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0);
if (this == root)
{