From 59976ece36a304421135650e6bc3b4f70db6f64c Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Thu, 6 Jul 2017 18:50:54 +0100 Subject: SL-722 - crash fix when leaving region --- indra/newview/llvovolume.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 94556a9f70..378a353f31 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3414,8 +3414,11 @@ void LLVOVolume::updateAnimatedObjectState(LLViewerObject *old_parent, LLViewerO } if (old_volp && old_volp->isAnimatedObject()) { - // W have been removed from an animated object, need to do cleanup. - old_volp->getControlAvatar()->removeAttachmentOverridesForObject(this); + if (old_volp->getControlAvatar()) + { + // We have been removed from an animated object, need to do cleanup. + old_volp->getControlAvatar()->removeAttachmentOverridesForObject(this); + } } if (old_volp) -- cgit v1.2.3