diff options
| author | Anchor <none@none> | 2019-04-30 15:49:03 -0600 |
|---|---|---|
| committer | Anchor <none@none> | 2019-04-30 15:49:03 -0600 |
| commit | f9f129f93d8eab94e58ff2229a13d68bee23f959 (patch) | |
| tree | 3e723d8b155c1e5eda74f1333e656e9db64cba7d /indra/newview/llviewerobject.cpp | |
| parent | 713daebc414da6cdc40b4a3e37748df3af0a8290 (diff) | |
| parent | 81dbd3663bdaff741e68de0ec4d4d35bedf6649d (diff) | |
Merge
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 0493db8746..42fdf5cfd3 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; } } |