diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-01-08 21:28:47 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2019-01-08 21:28:47 +0000 |
| commit | b417be1781637ff9d35b338eed1678e7bb6f04ad (patch) | |
| tree | f8fba97868e4614b5fb1c469cb0d999d63fa58bd | |
| parent | 3bd516020266ce2b37ce75786e5719038b22d413 (diff) | |
SL-10285 - removed one possible route for the isImpostor() crash. Intermittent issue.
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index d3fd5813a0..0f02c23cb0 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -60,6 +60,8 @@ LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewer // virtual LLControlAvatar::~LLControlAvatar() { + // Should already have been unlinked before destruction + llassert(!mRootVolp); } // virtual 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; } } |