diff options
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files 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) |