diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-06-27 20:24:15 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-06-27 20:24:15 +0100 |
| commit | 7af46e7fe37552175c46a9366e9574bb9c716a68 (patch) | |
| tree | c62c16c8f5a7df282001b86091212de8a0a121a3 /indra/newview/llviewerobject.cpp | |
| parent | b6aedb116f60b9e4823f61b945b3f374d9267c1d (diff) | |
SL-722 - defer markDead() for LLControlAvatar when unlinking. Fixes asset crash in pipeline. Also added various checks for mDrawable null in llvoavatar.cpp.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index bd0e864f80..06efb1bc3a 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2958,7 +2958,7 @@ void LLViewerObject::unlinkControlAvatar() // This will remove the entire linkset from the control avatar LLControlAvatar *av = mControlAvatar; mControlAvatar = NULL; - av->markDead(); + av->markForDeath(); } // For non-root prims, removing from the linkset will // automatically remove the control avatar connection. |