diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-22 17:09:37 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-22 17:09:37 +0300 |
| commit | ed6943b913bb1affc6049384fa20bcb778f41c07 (patch) | |
| tree | 292b156d16556fbeb6149f2b5a3e853817061f82 /indra/newview/llviewerobjectlist.cpp | |
| parent | 2ec0ccb628e8fa2e8affe27dde4e4dab0906b5c5 (diff) | |
| parent | 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 932759c86d..2bf04dc204 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1383,7 +1383,11 @@ BOOL LLViewerObjectList::killObject(LLViewerObject *objectp) if (objectp) { - objectp->markDead(); // does the right thing if object already dead + // We are going to cleanup a lot of smart pointers to this object, they might be last, + // and object being NULLed while inside it's own function won't be pretty + // so create a pointer to make sure object will stay alive untill markDead() finishes + LLPointer<LLViewerObject> sp(objectp); + sp->markDead(); // does the right thing if object already dead return TRUE; } |