diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-17 16:47:13 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-17 16:47:13 +0300 |
| commit | 922793e4898ec272576f32b79cc31b1c299e1e21 (patch) | |
| tree | a79df77f8dd992ca6435383630cb90543e777e37 /indra/newview/llviewerobject.cpp | |
| parent | c6e310c7c2debb87e17d529e4d69b90049ad156f (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; } } |