diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-02-21 00:31:08 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-02-21 05:23:36 +0200 |
| commit | 5e697cc04c0dd876e2484dbe49e32ddd7a711b3d (patch) | |
| tree | 51d72868eef866fbb49aa505ad1efa660f5749ec /indra/newview/llviewerobject.cpp | |
| parent | 54dfcd7502a0f4cc6d14ac5fec026dcc9c498eaa (diff) | |
SL-20469 Crash at dead mRootVolp in getAttachedAvatar()
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index d46339e2fd..fc055a7303 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -392,6 +392,12 @@ LLViewerObject::~LLViewerObject() sNumZombieObjects--; llassert(mChildList.size() == 0); llassert(mControlAvatar.isNull()); // Should have been cleaned by now + if (mControlAvatar.notNull()) + { + mControlAvatar->markForDeath(); + mControlAvatar = NULL; + LL_WARNS() << "Dead object owned a live control avatar" << LL_ENDL; + } clearInventoryListeners(); } |