diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-12-12 00:15:29 +0200 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-12-12 00:40:22 +0200 |
| commit | 8c1aa6d6623995e56e1cf5de127befcf9033c8ca (patch) | |
| tree | 21f20ecba60349b832d4d4f9bbc6967a7eee4262 /indra/newview/llviewerobject.cpp | |
| parent | 810a3d24c2e3671f926091c062b101bdec6a1517 (diff) | |
SL-20714 Crash accessing mControlAVBridge
Looks like control avatar was recreated after cleanup then object was
deleted
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d6443b0bfb..1458570de2 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -391,6 +391,7 @@ LLViewerObject::~LLViewerObject() sNumObjects--; sNumZombieObjects--; llassert(mChildList.size() == 0); + llassert(mControlAvatar.isNull()); // Should have been cleaned by now clearInventoryListeners(); } @@ -3106,6 +3107,10 @@ void LLViewerObject::updateControlAvatar() return; } + // caller isn't supposed to operate on a dead object, + // avatar was already cleaned up + llassert(!isDead()); + bool should_have_control_avatar = false; if (is_animated_object) { |