diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-06 18:50:54 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-07-06 18:50:54 +0100 |
| commit | 59976ece36a304421135650e6bc3b4f70db6f64c (patch) | |
| tree | 93c07074bbefd16880f10c09e6804f8c9cdb5c3a /indra/newview | |
| parent | f55667397e75991348fa25b6ad581a36de99acf0 (diff) | |
SL-722 - crash fix when leaving region
Diffstat (limited to 'indra/newview')
| -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) |