SL-20345 Avoid of ASSERT (\!mRootVolp) in LLControlAvatar::~LLControlAvatar()

2023-09-27 11:53:23 +02:00 · 2023-09-27 11:53:23 +02:00 · 8e173de309
parent c3321645c8
commit 8e173de309
2 changed files with 1 additions and 1 deletions
--- 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;
 }
--- 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;
        }
    }