From bd75ec5abdc4570e02b6bd854fbf5ab7d4de3f4c Mon Sep 17 00:00:00 2001 From: Beq Date: Wed, 6 Sep 2023 09:42:22 +0100 Subject: [PATCH] drawable used when null (via Aleric) crashed on region crossing in OpenSim. --- indra/newview/llvovolume.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index afac7860e5..b89e11de50 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5385,7 +5385,10 @@ void LLControlAVBridge::updateSpatialExtents() // disappear when root goes off-screen" // // Expand extents to include Control Avatar placed outside of the bounds - if (controlAvatar && (rootWasDirty || controlAvatar->mPlaying)) + // mDrawable crash reported by Aleric Inglewood + // if (controlAvatar && (rootWasDirty || controlAvatar->mPlaying)) + if (controlAvatar && controlAvatar->mDrawable.notNull() && (rootWasDirty || controlAvatar->mPlaying)) + // { root->expandExtents(controlAvatar->mDrawable->getSpatialExtents(), *mDrawable->getXform()); }