diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-04-17 11:24:08 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-04-17 11:24:08 -0700 |
| commit | 5f8cca95f8890d22496932827626f6c437d2b188 (patch) | |
| tree | 716675dbd41416fd383568dfb47c5d3246f03423 /indra/newview/llviewerobject.cpp | |
| parent | a7e7d4a8185cd63c2f6f87fea992667912999426 (diff) | |
| parent | 81dbd3663bdaff741e68de0ec4d4d35bedf6649d (diff) | |
Merge 6.2.1
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index a7151c4d1b..226283e1b2 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3072,7 +3072,7 @@ void LLViewerObject::unlinkControlAvatar() if (mControlAvatar) { mControlAvatar->markForDeath(); - mControlAvatar->mRootVolp = NULL; + mControlAvatar->mRootVolp = NULL; mControlAvatar = NULL; } } |