diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-17 16:47:32 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-17 16:47:32 +0300 |
| commit | b5f842183958f5de8a09156510ede53ac34a5310 (patch) | |
| tree | a46044c60981c50c5ab473267c641f6c46b6aa2f /indra/newview/llviewerobject.cpp | |
| parent | 62bec6aa36abdbfea6c804c8c5f3381ae76b920b (diff) | |
| parent | 81dbd3663bdaff741e68de0ec4d4d35bedf6649d (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 1e46a1cf9e..226283e1b2 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3072,6 +3072,7 @@ void LLViewerObject::unlinkControlAvatar() if (mControlAvatar) { mControlAvatar->markForDeath(); + mControlAvatar->mRootVolp = NULL; mControlAvatar = NULL; } } |