From 7af46e7fe37552175c46a9366e9574bb9c716a68 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 27 Jun 2017 20:24:15 +0100
Subject: SL-722 - defer markDead() for LLControlAvatar when unlinking. Fixes
 asset crash in pipeline. Also added various checks for mDrawable null in
 llvoavatar.cpp.

---
 indra/newview/llviewerobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewerobject.cpp')

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.
-- 
cgit v1.2.3