SL-731 - added a hook for debug text specific to control avatars. Also renamed resetJointsOnDetach to removeAttachmentOverridesForObject to make the connection to addAttachmentOverridesForObject more obvious.

1 files changed, 10 insertions, 7 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 9a6153d3e6..c6051650cf 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -371,17 +371,19 @@ void LLViewerObject::markDead()
 		//LL_INFOS() << "Marking self " << mLocalID << " as dead." << LL_ENDL;
 		
 		// Root object of this hierarchy unlinks itself.
-		LLVOAvatar *av = getAvatarAncestor();
 		if (getParent())
 		{
 			((LLViewerObject *)getParent())->removeChild(this);
 		}
 		LLUUID mesh_id;
-		if (av && LLVOAvatar::getRiggedMeshID(this,mesh_id))
-		{
-			// This case is needed for indirectly attached mesh objects.
-			av->resetJointsOnDetach(mesh_id);
-		}
+        {
+            LLVOAvatar *av = getAvatar();
+            if (av && LLVOAvatar::getRiggedMeshID(this,mesh_id))
+            {
+                // This case is needed for indirectly attached mesh objects.
+                av->removeAttachmentOverridesForObject(mesh_id);
+            }
+        }
         if (getControlAvatar())
         {
             unlinkControlAvatar();
@@ -2950,7 +2952,7 @@ void LLViewerObject::unlinkControlAvatar()
 {
     if (getControlAvatar())
     {
-        getControlAvatar()->resetJointsOnDetach(this);
+        getControlAvatar()->removeAttachmentOverridesForObject(this);
     }
     if (isRootEdit())
     {
@@ -5187,6 +5189,7 @@ LLVOAvatar* LLViewerObject::asAvatar()
 // If this object is directly or indirectly parented by an avatar, return it.
 LLVOAvatar* LLViewerObject::getAvatarAncestor()
 {
+    LL_ERRS("AXON") << "this method has been targetted for termination. Use getAvatar()." << LL_ENDL;
 	LLViewerObject *pobj = (LLViewerObject*) getParent();
 	while (pobj)
 	{