diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-09-27 11:53:23 +0200 |
|---|---|---|
| committer | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-09-27 16:43:59 +0200 |
| commit | 8e173de3096a8bf79e0fa0aa5c5bd6a696dc20f8 (patch) | |
| tree | 176d5be9cd69f5ff470d8d7a47e2da7d4e1fe441 /indra/newview | |
| parent | c3321645c8d3bd33ca0a147b97c9022fc7f09e93 (diff) | |
SL-20345 Avoid of ASSERT (\!mRootVolp) in LLControlAvatar::~LLControlAvatar()
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index 91031034c6..af493fec16 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -379,6 +379,7 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time) void LLControlAvatar::markDead() { + mRootVolp = NULL; super::markDead(); mControlAVBridge = NULL; } diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index f47f0b4572..1a02e9ddd0 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3178,7 +3178,6 @@ void LLViewerObject::unlinkControlAvatar() if (mControlAvatar) { mControlAvatar->markForDeath(); - mControlAvatar->mRootVolp = NULL; mControlAvatar = NULL; } } |