diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-17 16:45:28 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-04-17 16:45:28 +0300 |
| commit | 459601625d0f2a7b8f5454261fc69e55ce7419e3 (patch) | |
| tree | b0502d9722dad46dfac35858b62858150942866c /indra/newview/llviewerobject.cpp | |
| parent | 19cae5d2ccbefee3741a80b8bc8e486dccf26873 (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; } } |