From 2233bb16a3e9c0cf435e1c6287f8972f228b7191 Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 13 Nov 2023 23:00:02 +0000 Subject: [PATCH] FIRE-33367 - crash toggling animesh state --- indra/newview/lldrawable.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 191a1f9c2e..faa4f1ee63 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -778,7 +778,10 @@ void LLDrawable::movePartition() if (mRenderType == LLPipeline::RENDER_TYPE_CONTROL_AV && isRoot()) { LLControlAvatar* controlAvatar = dynamic_cast(getVObj().get()); - if (controlAvatar && controlAvatar->mControlAVBridge) + // FIRE-33367 toggling animesh state off causes a crash + // if (controlAvatar && controlAvatar->mControlAVBridge ) + if (controlAvatar && controlAvatar->mControlAVBridge && controlAvatar->mControlAVBridge->mOctree) + // { ((LLSpatialGroup*)controlAvatar->mControlAVBridge->mOctree->getListener(0))->setState(LLViewerOctreeGroup::DIRTY); }