diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-09-27 11:53:23 +0200 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2023-09-27 16:36:49 +0200 |
| commit | 5713d1a3fdad397c2f9071bdc39db976950b97b1 (patch) | |
| tree | 971c0ddb4faee3afefea7930a5d634164c25be85 | |
| parent | c49616eb6a6f3231041d90923a2bf2564d46b294 (diff) | |
SL-20345 Avoid of ASSERT (\!mRootVolp) in LLControlAvatar::~LLControlAvatar()
| -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 a71c8bb60f..000c2c625b 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -362,6 +362,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 55a6d19103..8607c832b5 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; } } |