diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-17 08:43:14 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-17 08:43:14 -0700 |
| commit | f14888b6166f91533e778e94701b74a9639ebefd (patch) | |
| tree | 75f956b904bdbd774206534416dd6c5119da6a8f /indra/newview/llviewerobject.cpp | |
| parent | b8115d43c95504afa0a15a091e3d1ab389c71366 (diff) | |
| parent | 81dbd3663bdaff741e68de0ec4d4d35bedf6649d (diff) | |
Merge 6.2.1
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; } } |