From 55612611c679efda5d491944dee75f4768749277 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 30 May 2017 22:03:43 +0100
Subject: SL-694 - stub support for ObjectAnimation message type

---
 indra/newview/llviewermessage.cpp | 63 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 507087d1ae..6a6e932b4a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -103,6 +103,7 @@
 #include "llviewerwindow.h"
 #include "llvlmanager.h"
 #include "llvoavatarself.h"
+#include "llvovolume.h"
 #include "llworld.h"
 #include "pipeline.h"
 #include "llfloaterworldmap.h"
@@ -4976,12 +4977,15 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	LLUUID	animation_id;
 	LLUUID	uuid;
 	S32		anim_sequence_id;
-	LLVOAvatar *avatarp;
+	LLVOAvatar *avatarp = NULL;
 	
 	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
-	//clear animation flags
-	avatarp = (LLVOAvatar *)gObjectList.findObject(uuid);
+	LLViewerObject *objp = gObjectList.findObject(uuid);
+    if (objp)
+    {
+        avatarp =  objp->asAvatar();
+    }
 
 	if (!avatarp)
 	{
@@ -4993,6 +4997,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
 	S32 num_source_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationSourceList);
 
+	//clear animation flags
 	avatarp->mSignaledAnimations.clear();
 	
 	if (avatarp->isSelf())
@@ -5063,6 +5068,58 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	}
 }
 
+void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
+{
+	LLUUID	animation_id;
+	LLUUID	uuid;
+#if 0
+	S32		anim_sequence_id;
+#endif
+	
+	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
+
+    LLViewerObject *objp = gObjectList.findObject(uuid);
+    if (!objp)
+    {
+		LL_WARNS("Messaging") << "Received animation state for unknown object" << uuid << LL_ENDL;
+        return;
+    }
+    
+	LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp);
+    if (!volp)
+    {
+		LL_WARNS("Messaging") << "Received animation state for non-volume object" << uuid << LL_ENDL;
+        return;
+    }
+
+    if (!volp->isAnimatedMesh())
+    {
+		LL_WARNS("Messaging") << "Received animation state for non-animated object" << uuid << LL_ENDL;
+        return;
+    }
+
+    LL_WARNS() << "ADD SUPPORT FOR OBJECT ANIMATION HERE" << LL_ENDL;
+#if 0
+	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
+	S32 num_source_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationSourceList);
+
+	avatarp->mSignaledAnimations.clear();
+	
+    for( S32 i = 0; i < num_blocks; i++ )
+    {
+        mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
+        mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
+        avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
+    }
+
+	if (num_blocks)
+	{
+		avatarp->processAnimationStateChanges();
+	}
+#endif
+}
+
+
 void process_avatar_appearance(LLMessageSystem *mesgsys, void **user_data)
 {
 	LLUUID uuid;
-- 
cgit v1.3


From 74957676fc0b05825abc3af907241479f06fa8c3 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 5 Jun 2017 20:22:59 +0100
Subject: SL-694 - message changes for ObjectAnimation, more logging to
 validate behavior

---
 indra/newview/llviewermessage.cpp          | 23 +++++++++++------------
 scripts/messages/message_template.msg      |  4 ----
 scripts/messages/message_template.msg.sha1 |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6a6e932b4a..2b62ccd62f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5072,51 +5072,50 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 {
 	LLUUID	animation_id;
 	LLUUID	uuid;
-#if 0
 	S32		anim_sequence_id;
-#endif
 	
 	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
     LLViewerObject *objp = gObjectList.findObject(uuid);
     if (!objp)
     {
-		LL_WARNS("Messaging") << "Received animation state for unknown object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "AXON Received animation state for unknown object" << uuid << LL_ENDL;
         return;
     }
     
 	LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp);
     if (!volp)
     {
-		LL_WARNS("Messaging") << "Received animation state for non-volume object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "AXON Received animation state for non-volume object" << uuid << LL_ENDL;
         return;
     }
 
     if (!volp->isAnimatedMesh())
     {
-		LL_WARNS("Messaging") << "Received animation state for non-animated object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "AXON Received animation state for non-animated object" << uuid << LL_ENDL;
         return;
     }
 
-    LL_WARNS() << "ADD SUPPORT FOR OBJECT ANIMATION HERE" << LL_ENDL;
-#if 0
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
-	S32 num_source_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationSourceList);
+	LL_WARNS() << "AXON handle object animation here, num_blocks " << num_blocks << LL_ENDL;
 
-	avatarp->mSignaledAnimations.clear();
+	//avatarp->mSignaledAnimations.clear();
+    volp->setDebugText(llformat("Animations %d", num_blocks));
 	
     for( S32 i = 0; i < num_blocks; i++ )
     {
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
-        avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
+        //avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
+        LL_INFOS() << "AXON got object animation request for object " 
+                   << uuid << " animation id " << animation_id << LL_ENDL;
     }
 
 	if (num_blocks)
 	{
-		avatarp->processAnimationStateChanges();
+        LL_INFOS() << "AXON process animation state changes here" << LL_ENDL;
+		//avatarp->processAnimationStateChanges();
 	}
-#endif
 }
 
 
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 3185121a6e..18264ee59c 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -7305,10 +7305,6 @@ version 2.0
                 { AnimID                LLUUID }
                 { AnimSequenceID S32 }
         }
-        {
-                AnimationSourceList Variable
-                { ObjectID              LLUUID }
-        }
 }
 
 // *************************************************************************
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index 88b84e29da..db87ad5e77 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-428700550e70f611b632e3bb6422fe1d093a0313
\ No newline at end of file
+55df2c7135733c5da64ef8f01859b83a433a3a09
\ No newline at end of file
-- 
cgit v1.3


From c9baf4c66157c601cc4d4e325c7843b3bf9a0cad Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 7 Jun 2017 14:23:49 +0100
Subject: SL-691,SL-694 - viewer can animate objects based on server messaging.
 First end-to-end demo for animated objects.

---
 indra/newview/CMakeLists.txt         |   2 +
 indra/newview/llcontrolavatar.cpp    | 119 +++++++++++++++++++++++++++++++++++
 indra/newview/llcontrolavatar.h      |  50 +++++++++++++++
 indra/newview/lldrawpoolavatar.cpp   |   3 +-
 indra/newview/llviewermenu.cpp       |   2 +-
 indra/newview/llviewermessage.cpp    |  15 +++--
 indra/newview/llviewerobject.cpp     |  35 +++++++++--
 indra/newview/llviewerobject.h       |  11 +++-
 indra/newview/llviewerobjectlist.cpp |   4 +-
 indra/newview/llviewerobjectlist.h   |   2 +-
 indra/newview/llvoavatar.cpp         |  52 +++++++++++----
 indra/newview/llvoavatar.h           |   8 +++
 indra/newview/llvoavatarself.cpp     |   2 +-
 indra/newview/llvograss.cpp          |   3 +-
 indra/newview/llvovolume.cpp         |  32 +++++++++-
 15 files changed, 305 insertions(+), 35 deletions(-)
 create mode 100644 indra/newview/llcontrolavatar.cpp
 create mode 100644 indra/newview/llcontrolavatar.h

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

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b4e930d062..3787a25a9b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -149,6 +149,7 @@ set(viewer_SOURCE_FILES
     llcommunicationchannel.cpp
     llcompilequeue.cpp
     llconfirmationmanager.cpp
+    llcontrolavatar.cpp
     llconversationlog.cpp
     llconversationloglist.cpp
     llconversationloglistitem.cpp
@@ -769,6 +770,7 @@ set(viewer_HEADER_FILES
     llcommunicationchannel.h
     llcompilequeue.h
     llconfirmationmanager.h
+    llcontrolavatar.h
     llconversationlog.h
     llconversationloglist.h
     llconversationloglistitem.h
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
new file mode 100644
index 0000000000..1ecd3305ed
--- /dev/null
+++ b/indra/newview/llcontrolavatar.cpp
@@ -0,0 +1,119 @@
+/**
+ * @file llcontrolavatar.cpp
+ * @brief Implementation for special dummy avatar used to drive rigged meshes.
+ *
+ * $LicenseInfo:firstyear=2017&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2017, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llcontrolavatar.h"
+#include "llagent.h" //  Get state values from here
+#include "llviewerobjectlist.h"
+#include "pipeline.h"
+#include "llanimationstates.h"
+
+LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewerRegion* regionp) :
+    LLVOAvatar(id, pcode, regionp),
+    mPlaying(false)
+{
+    mIsControlAvatar = true;
+}
+
+// virtual
+LLControlAvatar::~LLControlAvatar()
+{
+}
+
+void LLControlAvatar::matchTransform(LLVOVolume *obj)
+{
+	setPositionAgent(obj->getRenderPosition());
+	//slamPosition();
+
+    LLQuaternion fix_axes_rot(-F_PI_BY_TWO, LLVector3(0,0,1));
+    LLQuaternion obj_rot = obj->getRotation();
+    LLQuaternion result_rot = fix_axes_rot * obj_rot;
+	setRotation(result_rot);
+    mRoot->setWorldRotation(result_rot);
+    mRoot->setPosition(obj->getRenderPosition());
+}
+
+// Based on LLViewerJointAttachment::setupDrawable(), without the attaching part.
+void LLControlAvatar::updateGeom(LLVOVolume *obj)
+{
+	if (!obj->mDrawable)
+		return;
+	if (obj->mDrawable->isActive())
+	{
+		obj->mDrawable->makeStatic(FALSE);
+	}
+	obj->mDrawable->makeActive();
+	gPipeline.markMoved(obj->mDrawable);
+	gPipeline.markTextured(obj->mDrawable); // face may need to change draw pool to/from POOL_HUD
+	obj->mDrawable->setState(LLDrawable::USE_BACKLIGHT);
+
+	LLViewerObject::const_child_list_t& child_list = obj->getChildren();
+	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); ++iter)
+	{
+		LLViewerObject* childp = *iter;
+		if (childp && childp->mDrawable.notNull())
+		{
+			childp->mDrawable->setState(LLDrawable::USE_BACKLIGHT);
+			gPipeline.markTextured(childp->mDrawable); // face may need to change draw pool to/from POOL_HUD
+			gPipeline.markMoved(childp->mDrawable);
+        }
+    }
+
+    gPipeline.markRebuild(obj->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+    obj->markForUpdate(TRUE);
+
+    matchTransform(obj);
+    //addAttachmentOverridesForObject(obj);
+}
+
+LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
+{
+    // TRIF Lifted from LLPreviewAnimation
+	LLControlAvatar *cav = (LLControlAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion(), CO_FLAG_CONTROL_AVATAR);
+	cav->createDrawable(&gPipeline);
+	cav->mIsDummy = TRUE;
+	cav->mSpecialRenderMode = 1;
+	//cav->setPositionAgent(obj->getRenderPosition());
+	//cav->slamPosition();
+	//cav->setRotation(obj->getRotation());
+	cav->updateJointLODs();
+	cav->updateGeometry(cav->mDrawable);
+	cav->startMotion(ANIM_AGENT_STAND, 5.0f);
+	cav->hideSkirt();
+
+	// stop extraneous animations
+	cav->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE );
+	cav->stopMotion( ANIM_AGENT_EYE, TRUE );
+	cav->stopMotion( ANIM_AGENT_BODY_NOISE, TRUE );
+	cav->stopMotion( ANIM_AGENT_BREATHE_ROT, TRUE );
+
+    // Sync up position/rotation with object
+    cav->matchTransform(obj);
+
+    return cav;
+}
+
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
new file mode 100644
index 0000000000..c8b1039363
--- /dev/null
+++ b/indra/newview/llcontrolavatar.h
@@ -0,0 +1,50 @@
+/**
+ * @file llcontrolavatar.h
+ * @brief Special dummy avatar used to drive rigged meshes.
+ *
+ * $LicenseInfo:firstyear=2017&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2017, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_CONTROLAVATAR_H
+#define LL_CONTROLAVATAR_H
+
+#include "llvoavatar.h"
+#include "llvovolume.h"
+
+class LLControlAvatar:
+    public LLVOAvatar
+{
+    LOG_CLASS(LLControlAvatar);
+
+public:
+    LLControlAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
+	virtual	~LLControlAvatar();
+
+    void matchTransform(LLVOVolume *obj);
+    void updateGeom(LLVOVolume *obj);
+        
+    static LLControlAvatar *createControlAvatar(LLVOVolume *obj);
+
+    bool mPlaying;
+};
+
+#endif //LL_CONTROLAVATAR_H
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index b221221f16..fa4fd7c533 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -467,7 +467,8 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
 	}
 	LLVOAvatar *avatarp = (LLVOAvatar *)facep->getDrawable()->getVObj().get();
 
-	if (avatarp->isDead() || avatarp->mIsDummy || avatarp->mDrawable.isNull())
+// AXON fix
+	if (avatarp->isDead() || /*avatarp->mIsDummy ||*/ avatarp->mDrawable.isNull())
 	{
 		return;
 	}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c68f6b8a15..eddbe16482 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6907,7 +6907,7 @@ class LLAttachmentEnableDrop : public view_listener_t
 		// Do not enable drop if all faces of object are not enabled
 		if (object && LLSelectMgr::getInstance()->getSelection()->contains(object,SELECT_ALL_TES ))
 		{
-    		S32 attachmentID  = ATTACHMENT_ID_FROM_STATE(object->getState());
+    		S32 attachmentID  = ATTACHMENT_ID_FROM_STATE(object->getAttachmentState());
 			attachment = get_if_there(gAgentAvatarp->mAttachmentPoints, attachmentID, (LLViewerJointAttachment*)NULL);
 
 			if (attachment)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 2b62ccd62f..7fd87f99d3 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -55,6 +55,7 @@
 #include "llagentcamera.h"
 #include "llcallingcard.h"
 #include "llbuycurrencyhtml.h"
+#include "llcontrolavatar.h"
 #include "llfirstuse.h"
 #include "llfloaterbump.h"
 #include "llfloaterbuyland.h"
@@ -5099,22 +5100,28 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
 	LL_WARNS() << "AXON handle object animation here, num_blocks " << num_blocks << LL_ENDL;
 
-	//avatarp->mSignaledAnimations.clear();
+    LLControlAvatar *avatarp = volp->mControlAvatar;
+    if (!avatarp->mPlaying)
+    {
+        avatarp->mPlaying = true;
+        avatarp->updateGeom(volp);
+    }
+	avatarp->mSignaledAnimations.clear();
     volp->setDebugText(llformat("Animations %d", num_blocks));
 	
     for( S32 i = 0; i < num_blocks; i++ )
     {
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
-        //avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
+        avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
         LL_INFOS() << "AXON got object animation request for object " 
                    << uuid << " animation id " << animation_id << LL_ENDL;
     }
 
-	if (num_blocks)
+	if (num_blocks >= 0)
 	{
         LL_INFOS() << "AXON process animation state changes here" << LL_ENDL;
-		//avatarp->processAnimationStateChanges();
+		avatarp->processAnimationStateChanges();
 	}
 }
 
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 030c0ca9f6..ff808ba079 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -60,6 +60,7 @@
 #include "llbbox.h"
 #include "llbox.h"
 #include "llcylinder.h"
+#include "llcontrolavatar.h"
 #include "lldrawable.h"
 #include "llface.h"
 #include "llfloaterproperties.h"
@@ -138,7 +139,7 @@ const F32 PHYSICS_TIMESTEP = 1.f / 45.f;
 static LLTrace::BlockTimerStatHandle FTM_CREATE_OBJECT("Create Object");
 
 // static
-LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
+LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp, S32 flags)
 {
 	LLViewerObject *res = NULL;
 	LL_RECORD_BLOCK_TIME(FTM_CREATE_OBJECT);
@@ -166,6 +167,12 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
 			}
 			res = gAgentAvatarp;
 		}
+		else if (flags & CO_FLAG_CONTROL_AVATAR)
+		{
+            LLControlAvatar *avatar = new LLControlAvatar(id, pcode, regionp);
+			avatar->initInstance();
+			res = avatar;
+		}
 		else
 		{
 			LLVOAvatar *avatar = new LLVOAvatar(id, pcode, regionp); 
@@ -235,6 +242,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
 	mText(),
 	mHudText(""),
 	mHudTextColor(LLColor4::white),
+    mControlAvatar(NULL),
 	mLastInterpUpdateSecs(0.f),
 	mLastMessageUpdateSecs(0.f),
 	mLatestRecvPacketID(0),
@@ -259,7 +267,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
 	mRotTime(0.f),
 	mAngularVelocityRot(),
 	mPreviousRotation(),
-	mState(0),
+	mAttachmentState(0),
 	mMedia(NULL),
 	mClickAction(0),
 	mObjectCost(0),
@@ -369,11 +377,18 @@ void LLViewerObject::markDead()
 			((LLViewerObject *)getParent())->removeChild(this);
 		}
 		LLUUID mesh_id;
+        // FIXME AXON - need to do this for control avatars too
 		if (av && LLVOAvatar::getRiggedMeshID(this,mesh_id))
 		{
 			// This case is needed for indirectly attached mesh objects.
 			av->resetJointsOnDetach(mesh_id);
 		}
+        if (mControlAvatar)
+        {
+            LLControlAvatar *av = mControlAvatar;
+            mControlAvatar = NULL;
+            av->markDead();
+        }
 
 		// Mark itself as dead
 		mDead = TRUE;
@@ -1378,7 +1393,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
 				U8 state;
 				mesgsys->getU8Fast(_PREHASH_ObjectData, _PREHASH_State, state, block_num );
-				mState = state;
+				mAttachmentState = state;
 
 				// ...new objects that should come in selected need to be added to the selected list
 				mCreateSelected = ((flags & FLAGS_CREATE_SELECTED) != 0);
@@ -1648,7 +1663,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
 				U8 state;
 				mesgsys->getU8Fast(_PREHASH_ObjectData, _PREHASH_State, state, block_num );
-				mState = state;
+				mAttachmentState = state;
 				break;
 			}
 
@@ -1671,7 +1686,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 		U8		state;
 
 		dp->unpackU8(state, "State");
-		mState = state;
+		mAttachmentState = state;
 
 		switch(update_type)
 		{
@@ -3857,7 +3872,7 @@ const LLVector3 LLViewerObject::getRenderPosition() const
 	if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED))
 	{
 		LLVOAvatar* avatar = getAvatar();
-		if (avatar)
+		if (avatar && !mControlAvatar)
 		{
 			return avatar->getPositionAgent();
 		}
@@ -3993,6 +4008,10 @@ void LLViewerObject::setPosition(const LLVector3 &pos, BOOL damped)
 		// position caches need to be up to date on root objects
 		updatePositionCaches();
 	}
+    if (mControlAvatar)
+    {
+        mControlAvatar->matchTransform(dynamic_cast<LLVOVolume*>(this));
+    }
 }
 
 void LLViewerObject::setPositionGlobal(const LLVector3d &pos_global, BOOL damped)
@@ -6358,6 +6377,10 @@ const std::string& LLViewerObject::getAttachmentItemName() const
 //virtual
 LLVOAvatar* LLViewerObject::getAvatar() const
 {
+    if (mControlAvatar)
+    {
+        return mControlAvatar;
+    }
 	if (isAttachment())
 	{
 		LLViewerObject* vobj = (LLViewerObject*) getParent();
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 24fcf0517e..e727567957 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -47,6 +47,7 @@ class LLAgent;			// TODO: Get rid of this.
 class LLAudioSource;
 class LLAudioSourceVO;
 class LLColor4;
+class LLControlAvatar;
 class LLDataPacker;
 class LLDataPackerBinaryBuffer;
 class LLDrawable;
@@ -374,7 +375,7 @@ public:
 
 	void sendShapeUpdate();
 
-	U8 getState()							{ return mState; }
+	U8 getAttachmentState()							{ return mAttachmentState; }
 
 	F32 getAppAngle() const					{ return mAppAngle; }
 	F32 getPixelArea() const				{ return mPixelArea; }
@@ -683,6 +684,8 @@ public:
 
 	static			BOOL		sUseSharedDrawables;
 
+    LLPointer<LLControlAvatar> mControlAvatar;
+
 protected:
 	// delete an item in the inventory, but don't tell the
 	// server. This is used internally by remove, update, and
@@ -693,8 +696,10 @@ protected:
 	// updateInventory.
 	void doUpdateInventory(LLPointer<LLViewerInventoryItem>& item, U8 key, bool is_new);
 
+    // Flags for createObject
+    static const S32 CO_FLAG_CONTROL_AVATAR = 1 << 1;
 
-	static LLViewerObject *createObject(const LLUUID &id, LLPCode pcode, LLViewerRegion *regionp);
+	static LLViewerObject *createObject(const LLUUID &id, LLPCode pcode, LLViewerRegion *regionp, S32 flags = 0);
 
 	BOOL setData(const U8 *datap, const U32 data_size);
 
@@ -782,7 +787,7 @@ protected:
 	LLQuaternion	mAngularVelocityRot;		// accumulated rotation from the angular velocity computations
 	LLQuaternion	mPreviousRotation;
 
-	U8				mState;	// legacy
+	U8				mAttachmentState;	// this encodes the attachment id in a somewhat complex way. 0 if not an attachment.
 	LLViewerObjectMedia* mMedia;	// NULL if no media associated
 	U8 mClickAction;
 	F32 mObjectCost; //resource cost of this object or -1 if unknown
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 8f98d66c0c..1f99119d82 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1942,12 +1942,12 @@ void LLViewerObjectList::resetObjectBeacons()
 	mDebugBeacons.clear();
 }
 
-LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp)
+LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp, S32 flags)
 {
 	LLUUID fullid;
 	fullid.generate();
 
-	LLViewerObject *objectp = LLViewerObject::createObject(fullid, pcode, regionp);
+	LLViewerObject *objectp = LLViewerObject::createObject(fullid, pcode, regionp, flags);
 	if (!objectp)
 	{
 // 		LL_WARNS() << "Couldn't create object of type " << LLPrimitive::pCodeToString(pcode) << LL_ENDL;
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 94c751acc6..72b2b99004 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -67,7 +67,7 @@ public:
 	inline LLViewerObject *getObject(const S32 index);
 	
 	inline LLViewerObject *findObject(const LLUUID &id);
-	LLViewerObject *createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp); // Create a viewer-side object
+	LLViewerObject *createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp, S32 flags = 0); // Create a viewer-side object
 	LLViewerObject *createObjectFromCache(const LLPCode pcode, LLViewerRegion *regionp, const LLUUID &uuid, const U32 local_id);
 	LLViewerObject *createObject(const LLPCode pcode, LLViewerRegion *regionp,
 								 const LLUUID &uuid, const U32 local_id, const LLHost &sender);
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 3968266c27..7ba264f35a 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -44,6 +44,7 @@
 #include "llavatarnamecache.h"
 #include "llavatarpropertiesprocessor.h"
 #include "llavatarrendernotifier.h"
+#include "llcontrolavatar.h"
 #include "llexperiencecache.h"
 #include "llphysicsmotion.h"
 #include "llviewercontrol.h"
@@ -663,7 +664,8 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mLastUpdateRequestCOFVersion(-1),
 	mLastUpdateReceivedCOFVersion(-1),
 	mCachedMuteListUpdateTime(0),
-	mCachedInMuteList(false)
+	mCachedInMuteList(false),
+    mIsControlAvatar(false)
 {
 	LL_DEBUGS("AvatarRender") << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << LL_ENDL;
 
@@ -1942,7 +1944,7 @@ void LLVOAvatar::resetSkeleton(bool reset_animations)
 //-----------------------------------------------------------------------------
 void LLVOAvatar::releaseMeshData()
 {
-	if (sInstances.size() < AVATAR_RELEASE_THRESHOLD || mIsDummy)
+	if (sInstances.size() < AVATAR_RELEASE_THRESHOLD)// || mIsDummy)
 	{
 		return;
 	}
@@ -2738,7 +2740,8 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 																 LLPartData::LL_PART_EMISSIVE_MASK | // LLPartData::LL_PART_FOLLOW_SRC_MASK |
 																 LLPartData::LL_PART_TARGET_POS_MASK );
 			
-			if (!isTooComplex()) // do not generate particles for overly-complex avatars
+            // TRIF skip cloud effects for dummy avs as well
+			if (!mIsDummy && !isTooComplex()) // do not generate particles for overly-complex avatars
 			{
 				setParticleSource(particle_parameters, getID());
 			}
@@ -3530,7 +3533,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 	}
 
 	// change animation time quanta based on avatar render load
-	if (!isSelf() && !mIsDummy)
+	if (!isSelf())// && !mIsDummy)
 	{
 		F32 time_quantum = clamp_rescale((F32)sInstances.size(), 10.f, 35.f, 0.f, 0.25f);
 		F32 pixel_area_scale = clamp_rescale(mPixelArea, 100, 5000, 1.f, 0.f);
@@ -3652,7 +3655,8 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 		//--------------------------------------------------------------------
 		// Propagate viewer object rotation to root of avatar
 		//--------------------------------------------------------------------
-		if (!isAnyAnimationSignaled(AGENT_NO_ROTATE_ANIMS, NUM_AGENT_NO_ROTATE_ANIMS))
+        // FIXME TRIF - just skipping this for now for all dummy avs
+		if (!mIsDummy && !isAnyAnimationSignaled(AGENT_NO_ROTATE_ANIMS, NUM_AGENT_NO_ROTATE_ANIMS))
 		{
 			LLQuaternion iQ;
 			LLVector3 upDir( 0.0f, 0.0f, 1.0f );
@@ -4041,7 +4045,7 @@ void LLVOAvatar::updateVisibility()
 
 	if (mIsDummy)
 	{
-		visible = TRUE;
+		visible = FALSE;
 	}
 	else if (mDrawable.isNull())
 	{
@@ -4356,7 +4360,7 @@ U32 LLVOAvatar::renderSkinned()
 		{
 			if (!isSelf() || gAgent.needsRenderHead() || LLPipeline::sShadowRender)
 			{
-				if (isTextureVisible(TEX_HEAD_BAKED) || mIsDummy)
+				if (isTextureVisible(TEX_HEAD_BAKED))// || mIsDummy)
 				{
 					LLViewerJoint* head_mesh = getViewerJoint(MESH_ID_HEAD);
 					if (head_mesh)
@@ -4366,7 +4370,7 @@ U32 LLVOAvatar::renderSkinned()
 					first_pass = FALSE;
 				}
 			}
-			if (isTextureVisible(TEX_UPPER_BAKED) || mIsDummy)
+			if (isTextureVisible(TEX_UPPER_BAKED))// || mIsDummy)
 			{
 				LLViewerJoint* upper_mesh = getViewerJoint(MESH_ID_UPPER_BODY);
 				if (upper_mesh)
@@ -4376,7 +4380,7 @@ U32 LLVOAvatar::renderSkinned()
 				first_pass = FALSE;
 			}
 			
-			if (isTextureVisible(TEX_LOWER_BAKED) || mIsDummy)
+			if (isTextureVisible(TEX_LOWER_BAKED))// || mIsDummy)
 			{
 				LLViewerJoint* lower_mesh = getViewerJoint(MESH_ID_LOWER_BODY);
 				if (lower_mesh)
@@ -4435,6 +4439,8 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass)
 		}
 		// Can't test for baked hair being defined, since that won't always be the case (not all viewers send baked hair)
 		// TODO: 1.25 will be able to switch this logic back to calling isTextureVisible();
+        if (!mIsDummy)
+        {
 		if ( (getImage(TEX_HAIR_BAKED, 0) && getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE)
 			|| LLDrawPoolAlpha::sShowDebugAlpha)		
 		{
@@ -4445,6 +4451,7 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass)
 			}
 			first_pass = FALSE;
 		}
+        }
 		if (LLPipeline::sImpostorRender)
 		{
 			gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
@@ -5521,12 +5528,26 @@ void LLVOAvatar::rebuildAttachmentOverrides()
 //-----------------------------------------------------------------------------
 void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
 {
-	LLVOAvatar *av = vo->getAvatarAncestor();
+    bool non_attached_case = false;
+    // FIXME TRIF - will this work if vo has child objects?
+    if (vo->mControlAvatar)
+    {
+        non_attached_case = true;
+    }
+    LLVOAvatar *av;
+    if (non_attached_case)
+    {
+        av = vo->mControlAvatar;
+    }
+    else
+    {
+        av = vo->getAvatarAncestor();
 	if (!av || (av != this))
 	{
 		LL_WARNS("Avatar") << "called with invalid avatar" << LL_ENDL;
         return;
 	}
+    }
 
     LLScopedContextString str("addAttachmentOverridesForObject " + av->getFullname());
     
@@ -5554,7 +5575,7 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
 	LLUUID currentId = vobj->getVolume()->getParams().getSculptID();						
 	const LLMeshSkinInfo*  pSkinData = gMeshRepo.getSkinInfo( currentId, vobj );
 
-	if ( vobj && vobj->isAttachment() && vobj->isMesh() && pSkinData )
+	if ( vobj && (vobj->isAttachment()||non_attached_case) && vobj->isMesh() && pSkinData )
 	{
 		const int bindCnt = pSkinData->mAlternateBindMatrix.size();								
         const int jointCnt = pSkinData->mJointNames.size();
@@ -5738,6 +5759,7 @@ void LLVOAvatar::showAttachmentOverrides(bool verbose) const
 //-----------------------------------------------------------------------------
 // resetJointsOnDetach
 //-----------------------------------------------------------------------------
+// TRIF handle NPC case
 void LLVOAvatar::resetJointsOnDetach(LLViewerObject *vo)
 {
 	LLVOAvatar *av = vo->getAvatarAncestor();
@@ -5766,6 +5788,7 @@ void LLVOAvatar::resetJointsOnDetach(LLViewerObject *vo)
 //-----------------------------------------------------------------------------
 // resetJointsOnDetach
 //-----------------------------------------------------------------------------
+// TRIF handle NPC case
 void LLVOAvatar::resetJointsOnDetach(const LLUUID& mesh_id)
 {	
 	//Subsequent joints are relative to pelvis
@@ -6288,7 +6311,7 @@ void LLVOAvatar::removeChild(LLViewerObject *childp)
 
 LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* viewer_object)
 {
-	S32 attachmentID = ATTACHMENT_ID_FROM_STATE(viewer_object->getState());
+	S32 attachmentID = ATTACHMENT_ID_FROM_STATE(viewer_object->getAttachmentState());
 
 	// This should never happen unless the server didn't process the attachment point
 	// correctly, but putting this check in here to be safe.
@@ -6812,6 +6835,11 @@ BOOL LLVOAvatar::isVisible() const
 // Determine if we have enough avatar data to render
 bool LLVOAvatar::getIsCloud() const
 {
+	if (mIsDummy)
+	{
+		return false;
+	}
+
 	return (   ((const_cast<LLVOAvatar*>(this))->visualParamWeightsAreDefault())// Do we have a shape?
 			|| (   !isTextureDefined(TEX_LOWER_BAKED)
 				|| !isTextureDefined(TEX_UPPER_BAKED)
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index bd89d4ef23..2832f940f4 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -233,6 +233,8 @@ public:
 public:
 	virtual bool 	isSelf() const { return false; } // True if this avatar is for this viewer's agent
 
+	virtual bool 	isControlAvatar() const { return mIsControlAvatar; } // True if this avatar is a control av (no associated user)
+
 private: //aligned members
 	LL_ALIGN_16(LLVector4a	mImpostorExtents[2]);
 
@@ -440,6 +442,12 @@ public:
 
 	VisualMuteSettings		mVisuallyMuteSetting;			// Always or never visually mute this AV
 
+	//--------------------------------------------------------------------
+	// NPC status
+	//--------------------------------------------------------------------
+public:
+    bool mIsControlAvatar;
+
 	//--------------------------------------------------------------------
 	// Morph masks
 	//--------------------------------------------------------------------
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index aa5d82a096..2137bf4eb3 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -2789,7 +2789,7 @@ BOOL LLVOAvatarSelf::needsRenderBeam()
 		// don't render selection beam on hud objects
 		is_touching_or_grabbing = FALSE;
 	}
-	return is_touching_or_grabbing || (mState & AGENT_STATE_EDITING && LLSelectMgr::getInstance()->shouldShowSelection());
+	return is_touching_or_grabbing || (getAttachmentState() & AGENT_STATE_EDITING && LLSelectMgr::getInstance()->shouldShowSelection());
 }
 
 // static
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index de63a3963c..e7e4e6f228 100644
--- a/indra/newview/llvograss.cpp
+++ b/indra/newview/llvograss.cpp
@@ -92,7 +92,8 @@ LLVOGrass::~LLVOGrass()
 
 void LLVOGrass::updateSpecies()
 {
-	mSpecies = mState;
+	// TRIF is grass still even supported? This use of state seems odd.
+	mSpecies = getAttachmentState();
 	
 	if (!sSpeciesTable.count(mSpecies))
 	{
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ed0205704f..a2f417a5cc 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -76,8 +76,13 @@
 #include "lldatapacker.h"
 #include "llviewershadermgr.h"
 #include "llvoavatar.h"
+#include "llcontrolavatar.h"
+#include "llvoavatarself.h"
 #include "llvocache.h"
 #include "llmaterialmgr.h"
+#include "llanimationstates.h"
+#include "llinventorytype.h"
+#include "llviewerinventory.h"
 
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
@@ -3383,7 +3388,7 @@ void LLVOVolume::updateRadius()
 
 BOOL LLVOVolume::isAttachment() const
 {
-	return mState != 0 ;
+	return mAttachmentState != 0 ;
 }
 
 BOOL LLVOVolume::isHUDAttachment() const
@@ -3391,7 +3396,7 @@ BOOL LLVOVolume::isHUDAttachment() const
 	// *NOTE: we assume hud attachment points are in defined range
 	// since this range is constant for backwards compatibility
 	// reasons this is probably a reasonable assumption to make
-	S32 attachment_id = ATTACHMENT_ID_FROM_STATE(mState);
+	S32 attachment_id = ATTACHMENT_ID_FROM_STATE(mAttachmentState);
 	return ( attachment_id >= 31 && attachment_id <= 38 );
 }
 
@@ -4825,10 +4830,31 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
                           vobj->isMesh() && 
 						  gMeshRepo.getSkinInfo(vobj->getVolume()->getParams().getSculptID(), vobj);
 
+            bool rigged_non_attachment = !vobj->isAttachment() &&
+                                         vobj->isMesh() && 
+                                         gMeshRepo.getSkinInfo(vobj->getVolume()->getParams().getSculptID(), vobj);
+
+            if (rigged_non_attachment)
+            {
+                if (!vobj->mControlAvatar)
+                {
+                    vobj->mControlAvatar = LLControlAvatar::createControlAvatar(vobj);
+                    vobj->mControlAvatar->addAttachmentOverridesForObject(vobj);
+                    vobj->requestInventory();
+                }
+                if (vobj->mControlAvatar)
+                {
+                    pAvatarVO = vobj->mControlAvatar;
+                }
+            }
+
 			bool bake_sunlight = LLPipeline::sBakeSunlight && drawablep->isStatic();
 
+            // TRIF why this variable? Only different from rigged if
+            // there are no LLFaces associated with the drawable.
 			bool is_rigged = false;
 
+            // TRIF handle NPC case
             if (rigged && pAvatarVO)
             {
                 pAvatarVO->addAttachmentOverridesForObject(vobj);
@@ -4855,7 +4881,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 				//sum up face verts and indices
 				drawablep->updateFaceSize(i);
 			
-				if (rigged) 
+				if (rigged || (vobj->mControlAvatar && vobj->mControlAvatar->mPlaying))
 				{
 					if (!facep->isState(LLFace::RIGGED))
 					{ //completely reset vertex buffer
-- 
cgit v1.3


From c5dc0ee36e8d17fd0cf25f5a1fbdfb8609a64ee0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 9 Jun 2017 21:13:54 +0100
Subject: SL-704 - code cleanup

---
 indra/newview/llcontrolavatar.cpp  |  5 +---
 indra/newview/lldrawpoolavatar.cpp |  2 +-
 indra/newview/llpanelvolume.cpp    |  4 +--
 indra/newview/llviewermessage.cpp  |  2 +-
 indra/newview/llvoavatar.cpp       | 54 ++++++++++++++++++++------------------
 indra/newview/llvograss.cpp        |  2 +-
 indra/newview/llvovolume.cpp       | 10 +++----
 indra/newview/llvovolume.h         |  4 +--
 8 files changed, 42 insertions(+), 41 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 1ecd3305ed..a8caba08af 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -92,14 +92,11 @@ void LLControlAvatar::updateGeom(LLVOVolume *obj)
 
 LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
 {
-    // TRIF Lifted from LLPreviewAnimation
+    // AXON Lifted from LLPreviewAnimation
 	LLControlAvatar *cav = (LLControlAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion(), CO_FLAG_CONTROL_AVATAR);
 	cav->createDrawable(&gPipeline);
 	cav->mIsDummy = TRUE;
 	cav->mSpecialRenderMode = 1;
-	//cav->setPositionAgent(obj->getRenderPosition());
-	//cav->slamPosition();
-	//cav->setRotation(obj->getRotation());
 	cav->updateJointLODs();
 	cav->updateGeometry(cav->mDrawable);
 	cav->startMotion(ANIM_AGENT_STAND, 5.0f);
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index fa4fd7c533..869e37e08c 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -468,7 +468,7 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
 	LLVOAvatar *avatarp = (LLVOAvatar *)facep->getDrawable()->getVObj().get();
 
 // AXON fix
-	if (avatarp->isDead() || /*avatarp->mIsDummy ||*/ avatarp->mDrawable.isNull())
+	if (avatarp->isDead() || avatarp->mIsDummy || avatarp->mDrawable.isNull())
 	{
 		return;
 	}
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 58cbede57b..f34194db19 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -355,8 +355,8 @@ void LLPanelVolume::getState( )
     // AXON FIXME CHECK FOR SKIN INFO ALSO
     // WHAT ABOUT isPermanentEnforced?
     // What about linksets with some skinned objects?
-    BOOL can_be_animated_mesh = volobjp && volobjp->canBeAnimatedMesh() && editable;
-    getChildView("Animated Mesh Checkbox Ctrl")->setEnabled(can_be_animated_mesh);
+    BOOL can_be_animated_object = volobjp && volobjp->canBeAnimatedObject() && editable;
+    getChildView("Animated Mesh Checkbox Ctrl")->setEnabled(can_be_animated_object);
 
 	// Flexible properties
 	BOOL is_flexible = volobjp && volobjp->isFlexible();
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 7fd87f99d3..db237d30ea 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5091,7 +5091,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         return;
     }
 
-    if (!volp->isAnimatedMesh())
+    if (!volp->isAnimatedObject())
     {
 		LL_WARNS("Messaging") << "AXON Received animation state for non-animated object" << uuid << LL_ENDL;
         return;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7ba264f35a..1c9f79b200 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1944,7 +1944,9 @@ void LLVOAvatar::resetSkeleton(bool reset_animations)
 //-----------------------------------------------------------------------------
 void LLVOAvatar::releaseMeshData()
 {
-	if (sInstances.size() < AVATAR_RELEASE_THRESHOLD)// || mIsDummy)
+    // AXON what should we be doing here for control avs? Why are
+    // dummies treated differently in the first place?
+	if (sInstances.size() < AVATAR_RELEASE_THRESHOLD || mIsDummy)
 	{
 		return;
 	}
@@ -2740,7 +2742,7 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 																 LLPartData::LL_PART_EMISSIVE_MASK | // LLPartData::LL_PART_FOLLOW_SRC_MASK |
 																 LLPartData::LL_PART_TARGET_POS_MASK );
 			
-            // TRIF skip cloud effects for dummy avs as well
+            // AXON skip cloud effects for dummy avs as well
 			if (!mIsDummy && !isTooComplex()) // do not generate particles for overly-complex avatars
 			{
 				setParticleSource(particle_parameters, getID());
@@ -3533,7 +3535,9 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 	}
 
 	// change animation time quanta based on avatar render load
-	if (!isSelf())// && !mIsDummy)
+    // AXON how should control avs be handled here?
+    bool is_pure_dummy = mIsDummy && !isControlAvatar();
+	if (!isSelf() && !is_pure_dummy)
 	{
 		F32 time_quantum = clamp_rescale((F32)sInstances.size(), 10.f, 35.f, 0.f, 0.25f);
 		F32 pixel_area_scale = clamp_rescale(mPixelArea, 100, 5000, 1.f, 0.f);
@@ -3655,8 +3659,8 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 		//--------------------------------------------------------------------
 		// Propagate viewer object rotation to root of avatar
 		//--------------------------------------------------------------------
-        // FIXME TRIF - just skipping this for now for all dummy avs
-		if (!mIsDummy && !isAnyAnimationSignaled(AGENT_NO_ROTATE_ANIMS, NUM_AGENT_NO_ROTATE_ANIMS))
+        // AXON - also skip for control avatars
+		if (!isControlAvatar() && !isAnyAnimationSignaled(AGENT_NO_ROTATE_ANIMS, NUM_AGENT_NO_ROTATE_ANIMS))
 		{
 			LLQuaternion iQ;
 			LLVector3 upDir( 0.0f, 0.0f, 1.0f );
@@ -4356,11 +4360,12 @@ U32 LLVOAvatar::renderSkinned()
 		}
 		
 		BOOL first_pass = TRUE;
+        bool is_pure_dummy = mIsDummy && !isControlAvatar();
 		if (!LLDrawPoolAvatar::sSkipOpaque)
 		{
 			if (!isSelf() || gAgent.needsRenderHead() || LLPipeline::sShadowRender)
 			{
-				if (isTextureVisible(TEX_HEAD_BAKED))// || mIsDummy)
+				if (isTextureVisible(TEX_HEAD_BAKED) || is_pure_dummy)
 				{
 					LLViewerJoint* head_mesh = getViewerJoint(MESH_ID_HEAD);
 					if (head_mesh)
@@ -4370,7 +4375,7 @@ U32 LLVOAvatar::renderSkinned()
 					first_pass = FALSE;
 				}
 			}
-			if (isTextureVisible(TEX_UPPER_BAKED))// || mIsDummy)
+			if (isTextureVisible(TEX_UPPER_BAKED) || is_pure_dummy)
 			{
 				LLViewerJoint* upper_mesh = getViewerJoint(MESH_ID_UPPER_BODY);
 				if (upper_mesh)
@@ -4380,7 +4385,7 @@ U32 LLVOAvatar::renderSkinned()
 				first_pass = FALSE;
 			}
 			
-			if (isTextureVisible(TEX_LOWER_BAKED))// || mIsDummy)
+			if (isTextureVisible(TEX_LOWER_BAKED) || is_pure_dummy)
 			{
 				LLViewerJoint* lower_mesh = getViewerJoint(MESH_ID_LOWER_BODY);
 				if (lower_mesh)
@@ -4437,20 +4442,14 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass)
 			}
 			first_pass = FALSE;
 		}
-		// Can't test for baked hair being defined, since that won't always be the case (not all viewers send baked hair)
-		// TODO: 1.25 will be able to switch this logic back to calling isTextureVisible();
-        if (!mIsDummy)
+		if (isTextureVisible(TEX_HAIR_BAKED))
         {
-		if ( (getImage(TEX_HAIR_BAKED, 0) && getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE)
-			|| LLDrawPoolAlpha::sShowDebugAlpha)		
-		{
-			LLViewerJoint* hair_mesh = getViewerJoint(MESH_ID_HAIR);
-			if (hair_mesh)
-			{
-				num_indices += hair_mesh->render(mAdjustedPixelArea, first_pass, mIsDummy);
-			}
-			first_pass = FALSE;
-		}
+            LLViewerJoint* hair_mesh = getViewerJoint(MESH_ID_HAIR);
+            if (hair_mesh)
+            {
+                num_indices += hair_mesh->render(mAdjustedPixelArea, first_pass, mIsDummy);
+            }
+            first_pass = FALSE;
         }
 		if (LLPipeline::sImpostorRender)
 		{
@@ -4491,7 +4490,9 @@ U32 LLVOAvatar::renderRigid()
 		gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.5f);
 	}
 
-	if (isTextureVisible(TEX_EYES_BAKED)  || mIsDummy)
+    bool is_pure_dummy = mIsDummy && !isControlAvatar();
+
+	if (isTextureVisible(TEX_EYES_BAKED)  || is_pure_dummy)
 	{
 		LLViewerJoint* eyeball_left = getViewerJoint(MESH_ID_EYEBALL_LEFT);
 		LLViewerJoint* eyeball_right = getViewerJoint(MESH_ID_EYEBALL_RIGHT);
@@ -5529,7 +5530,7 @@ void LLVOAvatar::rebuildAttachmentOverrides()
 void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
 {
     bool non_attached_case = false;
-    // FIXME TRIF - will this work if vo has child objects?
+    // FIXME AXON - will this work if vo has child objects?
     if (vo->mControlAvatar)
     {
         non_attached_case = true;
@@ -5759,7 +5760,7 @@ void LLVOAvatar::showAttachmentOverrides(bool verbose) const
 //-----------------------------------------------------------------------------
 // resetJointsOnDetach
 //-----------------------------------------------------------------------------
-// TRIF handle NPC case
+// AXON handle NPC case
 void LLVOAvatar::resetJointsOnDetach(LLViewerObject *vo)
 {
 	LLVOAvatar *av = vo->getAvatarAncestor();
@@ -5788,7 +5789,7 @@ void LLVOAvatar::resetJointsOnDetach(LLViewerObject *vo)
 //-----------------------------------------------------------------------------
 // resetJointsOnDetach
 //-----------------------------------------------------------------------------
-// TRIF handle NPC case
+// AXON handle NPC case
 void LLVOAvatar::resetJointsOnDetach(const LLUUID& mesh_id)
 {	
 	//Subsequent joints are relative to pelvis
@@ -5867,6 +5868,7 @@ void LLVOAvatar::getGround(const LLVector3 &in_pos_agent, LLVector3 &out_pos_age
 	LLVector3d z_vec(0.0f, 0.0f, 1.0f);
 	LLVector3d p0_global, p1_global;
 
+    // AXON update for control avs?
 	if (mIsDummy)
 	{
 		outNorm.setVec(z_vec);
@@ -5896,6 +5898,7 @@ F32 LLVOAvatar::getTimeDilation()
 //-----------------------------------------------------------------------------
 F32 LLVOAvatar::getPixelArea() const
 {
+    // AXON update for control avatars
 	if (mIsDummy)
 	{
 		return 100000.f;
@@ -6827,6 +6830,7 @@ void LLVOAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color)
 
 BOOL LLVOAvatar::isVisible() const
 {
+    // AXON should we flag control avs as invisible?
 	return mDrawable.notNull()
 		&& (!mOrphaned || isSelf())
 		&& (mDrawable->isVisible() || mIsDummy);
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index e7e4e6f228..337f969f3d 100644
--- a/indra/newview/llvograss.cpp
+++ b/indra/newview/llvograss.cpp
@@ -92,7 +92,7 @@ LLVOGrass::~LLVOGrass()
 
 void LLVOGrass::updateSpecies()
 {
-	// TRIF is grass still even supported? This use of state seems odd.
+	// AXON is grass still even supported? This use of state seems odd.
 	mSpecies = getAttachmentState();
 	
 	if (!sSpeciesTable.count(mSpecies))
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index a2f417a5cc..59e1895bc6 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3308,7 +3308,7 @@ void LLVOVolume::setExtendedMeshFlags(U32 flags)
     }
 }
 
-bool LLVOVolume::canBeAnimatedMesh() const
+bool LLVOVolume::canBeAnimatedObject() const
 {
     if (!isMesh())
     {
@@ -3322,9 +3322,9 @@ bool LLVOVolume::canBeAnimatedMesh() const
     return true;
 }
 
-bool LLVOVolume::isAnimatedMesh() const
+bool LLVOVolume::isAnimatedObject() const
 {
-    return canBeAnimatedMesh() && (getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG);
+    return canBeAnimatedObject() && (getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG);
 }
 
 //----------------------------------------------------------------------------
@@ -4850,11 +4850,11 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 
 			bool bake_sunlight = LLPipeline::sBakeSunlight && drawablep->isStatic();
 
-            // TRIF why this variable? Only different from rigged if
+            // AXON why this variable? Only different from rigged if
             // there are no LLFaces associated with the drawable.
 			bool is_rigged = false;
 
-            // TRIF handle NPC case
+            // AXON handle NPC case
             if (rigged && pAvatarVO)
             {
                 pAvatarVO->addAttachmentOverridesForObject(vobj);
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 5918166aff..75dabd961a 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -269,8 +269,8 @@ public:
     // Extended Mesh Properties
     U32 getExtendedMeshFlags() const;
     void setExtendedMeshFlags(U32 flags);
-    bool canBeAnimatedMesh() const;
-    bool isAnimatedMesh() const;
+    bool canBeAnimatedObject() const;
+    bool isAnimatedObject() const;
 
     // Functions that deal with media, or media navigation
     
-- 
cgit v1.3


From b2a06578187af5446b5e24379abc8764f0cd731f Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 16 Jun 2017 16:03:06 +0100
Subject: SL-697 - global scale function for LLControlAvatar, to support
 arbitrary scaling of animated objects. Not currently used.

---
 indra/llcharacter/lljoint.cpp     |  2 +-
 indra/newview/llcontrolavatar.cpp | 55 +++++++++++++++++++++++++++++++++++++--
 indra/newview/llcontrolavatar.h   |  4 +++
 indra/newview/llviewermessage.cpp |  8 +++++-
 4 files changed, 65 insertions(+), 4 deletions(-)

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

diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index a3d5679f65..89335a20f5 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -881,7 +881,7 @@ void LLJoint::setWorldRotation( const LLQuaternion& rot )
 //--------------------------------------------------------------------
 const LLVector3& LLJoint::getScale()
 {
-	return mXform.getScale();	
+    return mXform.getScale();
 }
 
 //--------------------------------------------------------------------
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index a8caba08af..03a374ebdb 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -33,7 +33,8 @@
 
 LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewerRegion* regionp) :
     LLVOAvatar(id, pcode, regionp),
-    mPlaying(false)
+    mPlaying(false),
+    mGlobalScale(1.0f)
 {
     mIsControlAvatar = true;
 }
@@ -56,6 +57,35 @@ void LLControlAvatar::matchTransform(LLVOVolume *obj)
     mRoot->setPosition(obj->getRenderPosition());
 }
 
+void LLControlAvatar::setGlobalScale(F32 scale)
+{
+    if (scale <= 0.0)
+    {
+        LL_WARNS() << "invalid global scale " << scale << LL_ENDL;
+        return;
+    }
+    if (scale != mGlobalScale)
+    {
+        F32 adjust_scale = scale/mGlobalScale;
+        LL_INFOS() << "scale " << scale << " adjustment " << adjust_scale << LL_ENDL;
+        // AXON - should we be scaling from the pelvis or the root?
+        recursiveScaleJoint(mPelvisp,adjust_scale);
+        mGlobalScale = scale;
+    }
+}
+
+void LLControlAvatar::recursiveScaleJoint(LLJoint* joint, F32 factor)
+{
+    joint->setScale(factor * joint->getScale());
+    
+	for (LLJoint::child_list_t::iterator iter = joint->mChildren.begin();
+		 iter != joint->mChildren.end(); ++iter)
+	{
+		LLJoint* child = *iter;
+		recursiveScaleJoint(child, factor);
+	}
+}
+
 // Based on LLViewerJointAttachment::setupDrawable(), without the attaching part.
 void LLControlAvatar::updateGeom(LLVOVolume *obj)
 {
@@ -86,8 +116,29 @@ void LLControlAvatar::updateGeom(LLVOVolume *obj)
     gPipeline.markRebuild(obj->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
     obj->markForUpdate(TRUE);
 
+    // Note that attachment overrides aren't needed here, have already
+    // been applied at the time the mControlAvatar was created, in
+    // llvovolume.cpp.
+
     matchTransform(obj);
-    //addAttachmentOverridesForObject(obj);
+
+    // AXON testing scale
+
+    // What should the scale be? What we really want is the ratio
+    // between the scale at which the object was originally designed
+    // and rigged, and the scale to which it has been subsequently
+    // modified - for example, if the object has been scaled down by a
+    // factor of 2 then we should use 0.5 as the global scale. But we
+    // don't have the original scale stored anywhere, just the current
+    // scale. Possibilities - 1) remember the original scale
+    // somewhere, 2) add another field to let the user specify the
+    // global scale, 3) approximate the original scale by looking at
+    // the proportions of the skeleton after joint positions have
+    // been applied
+    
+    //LLVector3 obj_scale = obj->getScale();
+    //F32 obj_scale_z = llmax(obj_scale[2],0.1f);
+    //setGlobalScale(obj_scale_z/2.0f); // roughly fit avatar height range (2m) into object height
 }
 
 LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index c8b1039363..a783b9228f 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -42,9 +42,13 @@ public:
     void matchTransform(LLVOVolume *obj);
     void updateGeom(LLVOVolume *obj);
         
+    void setGlobalScale(F32 scale);
+    void recursiveScaleJoint(LLJoint *joint, F32 factor);
     static LLControlAvatar *createControlAvatar(LLVOVolume *obj);
 
     bool mPlaying;
+
+    F32 mGlobalScale;
 };
 
 #endif //LL_CONTROLAVATAR_H
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index db237d30ea..f359c1455f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5097,10 +5097,16 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         return;
     }
 
+    LLControlAvatar *avatarp = volp->mControlAvatar;
+    if (!avatarp)
+    {
+        LL_WARNS() << "AXON no control avatar, ignoring" << LL_ENDL;
+        return;
+    }
+    
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
 	LL_WARNS() << "AXON handle object animation here, num_blocks " << num_blocks << LL_ENDL;
 
-    LLControlAvatar *avatarp = volp->mControlAvatar;
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
-- 
cgit v1.3


From e0d6a6a40192caa5b9d62165da5f23a5ade6e4b0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 19 Jun 2017 20:44:04 +0100
Subject: SL-725 - suppress default animations for LLControlAvatar, using a new
 mEnableDefaultAnimations field

---
 indra/newview/llcontrolavatar.cpp |  4 +++-
 indra/newview/llviewermessage.cpp |  1 -
 indra/newview/llvoavatar.cpp      | 30 ++++++++++++++++++++++++------
 indra/newview/llvoavatar.h        |  5 +++--
 4 files changed, 30 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 03a374ebdb..8027ea9c73 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -30,6 +30,7 @@
 #include "llviewerobjectlist.h"
 #include "pipeline.h"
 #include "llanimationstates.h"
+#include "llviewercontrol.h"
 
 LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewerRegion* regionp) :
     LLVOAvatar(id, pcode, regionp),
@@ -37,6 +38,7 @@ LLControlAvatar::LLControlAvatar(const LLUUID& id, const LLPCode pcode, LLViewer
     mGlobalScale(1.0f)
 {
     mIsControlAvatar = true;
+    mEnableDefaultMotions = false;
 }
 
 // virtual
@@ -150,7 +152,7 @@ LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
 	cav->mSpecialRenderMode = 1;
 	cav->updateJointLODs();
 	cav->updateGeometry(cav->mDrawable);
-	cav->startMotion(ANIM_AGENT_STAND, 5.0f);
+	//cav->startMotion(ANIM_AGENT_STAND, 5.0f);
 	cav->hideSkirt();
 
 	// stop extraneous animations
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f359c1455f..df69d6d197 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5113,7 +5113,6 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         avatarp->updateGeom(volp);
     }
 	avatarp->mSignaledAnimations.clear();
-    volp->setDebugText(llformat("Animations %d", num_blocks));
 	
     for( S32 i = 0; i < num_blocks; i++ )
     {
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 1c9f79b200..c1331bf521 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -665,7 +665,8 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mLastUpdateReceivedCOFVersion(-1),
 	mCachedMuteListUpdateTime(0),
 	mCachedInMuteList(false),
-    mIsControlAvatar(false)
+    mIsControlAvatar(false),
+    mEnableDefaultMotions(true)
 {
 	LL_DEBUGS("AvatarRender") << "LLVOAvatar Constructor (0x" << this << ") id:" << mID << LL_ENDL;
 
@@ -1798,7 +1799,11 @@ void LLVOAvatar::buildCharacter()
 		mAahMorph = getVisualParam( "Express_Open_Mouth" );
 	}
 
-	startDefaultMotions();
+    // Currently disabled for control avatars (animated objects), enabled for all others.
+    if (mEnableDefaultMotions)
+    {
+        startDefaultMotions();
+    }
 
 	//-------------------------------------------------------------------------
 	// restart any currently active motions
@@ -3411,6 +3416,7 @@ void LLVOAvatar::updateDebugText()
 			addDebugText(mBakedTextureDebugText);
 	}
 
+    // Develop -> Avatar -> Animation Info
 	if (LLVOAvatar::sShowAnimationDebug)
 	{
 		for (LLMotionController::motion_list_t::iterator iter = mMotionController.getActiveMotions().begin();
@@ -5042,7 +5048,10 @@ void LLVOAvatar::processAnimationStateChanges()
 	else if (mInAir && !mIsSitting)
 	{
 		stopMotion(ANIM_AGENT_WALK_ADJUST);
-		startMotion(ANIM_AGENT_FLY_ADJUST);
+        if (mEnableDefaultMotions)
+        {
+            startMotion(ANIM_AGENT_FLY_ADJUST);
+        }
 	}
 	else
 	{
@@ -5052,13 +5061,19 @@ void LLVOAvatar::processAnimationStateChanges()
 
 	if ( isAnyAnimationSignaled(AGENT_GUN_AIM_ANIMS, NUM_AGENT_GUN_AIM_ANIMS) )
 	{
-		startMotion(ANIM_AGENT_TARGET);
+        if (mEnableDefaultMotions)
+        {
+            startMotion(ANIM_AGENT_TARGET);
+        }
 		stopMotion(ANIM_AGENT_BODY_NOISE);
 	}
 	else
 	{
 		stopMotion(ANIM_AGENT_TARGET);
-		startMotion(ANIM_AGENT_BODY_NOISE);
+        if (mEnableDefaultMotions)
+        {
+            startMotion(ANIM_AGENT_BODY_NOISE);
+        }
 	}
 	
 	// clear all current animations
@@ -6670,7 +6685,10 @@ void LLVOAvatar::getOffObject()
 	mRoot->setRotation(cur_rotation_world);
 	mRoot->getXform()->update();
 
-	startMotion(ANIM_AGENT_BODY_NOISE);
+    if (mEnableDefaultMotions)
+    {
+        startMotion(ANIM_AGENT_BODY_NOISE);
+    }
 
 	if (isSelf())
 	{
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 2832f940f4..2b71cfbe61 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -242,7 +242,7 @@ private: //aligned members
 	// Updates
 	//--------------------------------------------------------------------
 public:
-	void			updateDebugText();
+	virtual void	updateDebugText();
 	virtual BOOL 	updateCharacter(LLAgent &agent);
 	void 			idleUpdateVoiceVisualizer(bool voice_enabled);
 	void 			idleUpdateMisc(bool detailed_update);
@@ -443,10 +443,11 @@ public:
 	VisualMuteSettings		mVisuallyMuteSetting;			// Always or never visually mute this AV
 
 	//--------------------------------------------------------------------
-	// NPC status
+	// animated object status
 	//--------------------------------------------------------------------
 public:
     bool mIsControlAvatar;
+    bool mEnableDefaultMotions;
 
 	//--------------------------------------------------------------------
 	// Morph masks
-- 
cgit v1.3


From 4907e437c1a9523e3b3d098403da8c780c6345f9 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 20 Jun 2017 15:04:11 +0100
Subject: SL-731 - control avatar has pointer back to associated volume. Can
 use this link to find associated inventory item name for an animation in
 debug display.

---
 indra/newview/llcontrolavatar.cpp | 43 ++++++++++++++++++---------------------
 indra/newview/llcontrolavatar.h   |  6 ++++--
 indra/newview/llviewermessage.cpp |  2 +-
 indra/newview/llviewerobject.cpp  |  2 +-
 indra/newview/llvoavatar.cpp      | 25 ++++++++++++++++++++---
 5 files changed, 48 insertions(+), 30 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 8027ea9c73..61055f6f58 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -46,17 +46,17 @@ LLControlAvatar::~LLControlAvatar()
 {
 }
 
-void LLControlAvatar::matchTransform(LLVOVolume *obj)
+void LLControlAvatar::matchVolumeTransform()
 {
-	setPositionAgent(obj->getRenderPosition());
+	setPositionAgent(mVolp->getRenderPosition());
 	//slamPosition();
 
     LLQuaternion fix_axes_rot(-F_PI_BY_TWO, LLVector3(0,0,1));
-    LLQuaternion obj_rot = obj->getRotation();
+    LLQuaternion obj_rot = mVolp->getRotation();
     LLQuaternion result_rot = fix_axes_rot * obj_rot;
 	setRotation(result_rot);
     mRoot->setWorldRotation(result_rot);
-    mRoot->setPosition(obj->getRenderPosition());
+    mRoot->setPosition(mVolp->getRenderPosition());
 }
 
 void LLControlAvatar::setGlobalScale(F32 scale)
@@ -89,20 +89,20 @@ void LLControlAvatar::recursiveScaleJoint(LLJoint* joint, F32 factor)
 }
 
 // Based on LLViewerJointAttachment::setupDrawable(), without the attaching part.
-void LLControlAvatar::updateGeom(LLVOVolume *obj)
+void LLControlAvatar::updateVolumeGeom()
 {
-	if (!obj->mDrawable)
+	if (!mVolp->mDrawable)
 		return;
-	if (obj->mDrawable->isActive())
+	if (mVolp->mDrawable->isActive())
 	{
-		obj->mDrawable->makeStatic(FALSE);
+		mVolp->mDrawable->makeStatic(FALSE);
 	}
-	obj->mDrawable->makeActive();
-	gPipeline.markMoved(obj->mDrawable);
-	gPipeline.markTextured(obj->mDrawable); // face may need to change draw pool to/from POOL_HUD
-	obj->mDrawable->setState(LLDrawable::USE_BACKLIGHT);
+	mVolp->mDrawable->makeActive();
+	gPipeline.markMoved(mVolp->mDrawable);
+	gPipeline.markTextured(mVolp->mDrawable); // face may need to change draw pool to/from POOL_HUD
+	mVolp->mDrawable->setState(LLDrawable::USE_BACKLIGHT);
 
-	LLViewerObject::const_child_list_t& child_list = obj->getChildren();
+	LLViewerObject::const_child_list_t& child_list = mVolp->getChildren();
 	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
 		 iter != child_list.end(); ++iter)
 	{
@@ -115,14 +115,14 @@ void LLControlAvatar::updateGeom(LLVOVolume *obj)
         }
     }
 
-    gPipeline.markRebuild(obj->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
-    obj->markForUpdate(TRUE);
+    gPipeline.markRebuild(mVolp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+    mVolp->markForUpdate(TRUE);
 
     // Note that attachment overrides aren't needed here, have already
     // been applied at the time the mControlAvatar was created, in
     // llvovolume.cpp.
 
-    matchTransform(obj);
+    matchVolumeTransform();
 
     // AXON testing scale
 
@@ -147,6 +147,9 @@ LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
 {
     // AXON Lifted from LLPreviewAnimation
 	LLControlAvatar *cav = (LLControlAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion(), CO_FLAG_CONTROL_AVATAR);
+
+    cav->mVolp = obj;
+    
 	cav->createDrawable(&gPipeline);
 	cav->mIsDummy = TRUE;
 	cav->mSpecialRenderMode = 1;
@@ -155,14 +158,8 @@ LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
 	//cav->startMotion(ANIM_AGENT_STAND, 5.0f);
 	cav->hideSkirt();
 
-	// stop extraneous animations
-	cav->stopMotion( ANIM_AGENT_HEAD_ROT, TRUE );
-	cav->stopMotion( ANIM_AGENT_EYE, TRUE );
-	cav->stopMotion( ANIM_AGENT_BODY_NOISE, TRUE );
-	cav->stopMotion( ANIM_AGENT_BREATHE_ROT, TRUE );
-
     // Sync up position/rotation with object
-    cav->matchTransform(obj);
+    cav->matchVolumeTransform();
 
     return cav;
 }
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index a783b9228f..f29388e035 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -39,8 +39,8 @@ public:
     LLControlAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
 	virtual	~LLControlAvatar();
 
-    void matchTransform(LLVOVolume *obj);
-    void updateGeom(LLVOVolume *obj);
+    void matchVolumeTransform();
+    void updateVolumeGeom();
         
     void setGlobalScale(F32 scale);
     void recursiveScaleJoint(LLJoint *joint, F32 factor);
@@ -49,6 +49,8 @@ public:
     bool mPlaying;
 
     F32 mGlobalScale;
+
+    LLVOVolume *mVolp;
 };
 
 #endif //LL_CONTROLAVATAR_H
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index df69d6d197..ff33fe79fa 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5110,7 +5110,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
-        avatarp->updateGeom(volp);
+		avatarp->updateVolumeGeom();
     }
 	avatarp->mSignaledAnimations.clear();
 	
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index ff808ba079..f1c7cfae0d 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4010,7 +4010,7 @@ void LLViewerObject::setPosition(const LLVector3 &pos, BOOL damped)
 	}
     if (mControlAvatar)
     {
-        mControlAvatar->matchTransform(dynamic_cast<LLVOVolume*>(this));
+        mControlAvatar->matchVolumeTransform();
     }
 }
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c1331bf521..c1b0f42c84 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3426,8 +3426,27 @@ void LLVOAvatar::updateDebugText()
 			if (motionp->getMinPixelArea() < getPixelArea())
 			{
 				std::string output;
-				if (motionp->getName().empty())
+                std::string motion_name = motionp->getName();
+				if (motion_name.empty())
 				{
+                    if (isControlAvatar())
+                    {
+                        LLControlAvatar *control_av = dynamic_cast<LLControlAvatar*>(this);
+                        // Try to get name from inventory of associated object
+                        LLVOVolume *volp = control_av->mVolp;
+                        if (volp)
+                        {
+                            volp->requestInventory(); // AXON should be a no-op if already requested or fetched?
+                            LLViewerInventoryItem* item = volp->getInventoryItemByAsset(motionp->getID());
+                            if (item)
+                            {
+                                motion_name = item->getName();
+                            }
+                        }
+                    }
+                }
+                if (motion_name.empty())
+                {
 					output = llformat("%s - %d",
 							  gAgent.isGodlikeWithoutAdminMenuFakery() ?
 							  motionp->getID().asString().c_str() :
@@ -3437,8 +3456,8 @@ void LLVOAvatar::updateDebugText()
 				else
 				{
 					output = llformat("%s - %d",
-							  motionp->getName().c_str(),
-							  (U32)motionp->getPriority());
+                                      motion_name.c_str(),
+                                      (U32)motionp->getPriority());
 				}
 				addDebugText(output);
 			}
-- 
cgit v1.3


From b6aedb116f60b9e4823f61b945b3f374d9267c1d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 27 Jun 2017 14:15:42 +0100
Subject: SL-722 - in progress on managing animated object state with linksets

---
 indra/newview/llcontrolavatar.cpp | 28 ++++++++---------
 indra/newview/llcontrolavatar.h   |  2 +-
 indra/newview/llviewermessage.cpp |  2 +-
 indra/newview/llviewerobject.cpp  | 65 +++++++++++++++++++++++++++++++++------
 indra/newview/llviewerobject.h    | 11 +++++++
 indra/newview/llvoavatar.cpp      |  6 ++--
 indra/newview/llvovolume.cpp      | 30 +++++++++++-------
 7 files changed, 105 insertions(+), 39 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 61055f6f58..26c4865e4c 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -48,15 +48,15 @@ LLControlAvatar::~LLControlAvatar()
 
 void LLControlAvatar::matchVolumeTransform()
 {
-	setPositionAgent(mVolp->getRenderPosition());
+	setPositionAgent(mRootVolp->getRenderPosition());
 	//slamPosition();
 
     LLQuaternion fix_axes_rot(-F_PI_BY_TWO, LLVector3(0,0,1));
-    LLQuaternion obj_rot = mVolp->getRotation();
+    LLQuaternion obj_rot = mRootVolp->getRotation();
     LLQuaternion result_rot = fix_axes_rot * obj_rot;
 	setRotation(result_rot);
     mRoot->setWorldRotation(result_rot);
-    mRoot->setPosition(mVolp->getRenderPosition());
+    mRoot->setPosition(mRootVolp->getRenderPosition());
 }
 
 void LLControlAvatar::setGlobalScale(F32 scale)
@@ -91,18 +91,18 @@ void LLControlAvatar::recursiveScaleJoint(LLJoint* joint, F32 factor)
 // Based on LLViewerJointAttachment::setupDrawable(), without the attaching part.
 void LLControlAvatar::updateVolumeGeom()
 {
-	if (!mVolp->mDrawable)
+	if (!mRootVolp->mDrawable)
 		return;
-	if (mVolp->mDrawable->isActive())
+	if (mRootVolp->mDrawable->isActive())
 	{
-		mVolp->mDrawable->makeStatic(FALSE);
+		mRootVolp->mDrawable->makeStatic(FALSE);
 	}
-	mVolp->mDrawable->makeActive();
-	gPipeline.markMoved(mVolp->mDrawable);
-	gPipeline.markTextured(mVolp->mDrawable); // face may need to change draw pool to/from POOL_HUD
-	mVolp->mDrawable->setState(LLDrawable::USE_BACKLIGHT);
+	mRootVolp->mDrawable->makeActive();
+	gPipeline.markMoved(mRootVolp->mDrawable);
+	gPipeline.markTextured(mRootVolp->mDrawable); // face may need to change draw pool to/from POOL_HUD
+	mRootVolp->mDrawable->setState(LLDrawable::USE_BACKLIGHT);
 
-	LLViewerObject::const_child_list_t& child_list = mVolp->getChildren();
+	LLViewerObject::const_child_list_t& child_list = mRootVolp->getChildren();
 	for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin();
 		 iter != child_list.end(); ++iter)
 	{
@@ -115,8 +115,8 @@ void LLControlAvatar::updateVolumeGeom()
         }
     }
 
-    gPipeline.markRebuild(mVolp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
-    mVolp->markForUpdate(TRUE);
+    gPipeline.markRebuild(mRootVolp->mDrawable, LLDrawable::REBUILD_ALL, TRUE);
+    mRootVolp->markForUpdate(TRUE);
 
     // Note that attachment overrides aren't needed here, have already
     // been applied at the time the mControlAvatar was created, in
@@ -148,7 +148,7 @@ LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
     // AXON Lifted from LLPreviewAnimation
 	LLControlAvatar *cav = (LLControlAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion(), CO_FLAG_CONTROL_AVATAR);
 
-    cav->mVolp = obj;
+    cav->mRootVolp = obj;
     
 	cav->createDrawable(&gPipeline);
 	cav->mIsDummy = TRUE;
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index f29388e035..bb54cc5b2d 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -50,7 +50,7 @@ public:
 
     F32 mGlobalScale;
 
-    LLVOVolume *mVolp;
+    LLVOVolume *mRootVolp;
 };
 
 #endif //LL_CONTROLAVATAR_H
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index ff33fe79fa..f8cdb5bf92 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5097,7 +5097,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         return;
     }
 
-    LLControlAvatar *avatarp = volp->mControlAvatar;
+    LLControlAvatar *avatarp = volp->getControlAvatar();
     if (!avatarp)
     {
         LL_WARNS() << "AXON no control avatar, ignoring" << LL_ENDL;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f1c7cfae0d..bd0e864f80 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -383,11 +383,9 @@ void LLViewerObject::markDead()
 			// This case is needed for indirectly attached mesh objects.
 			av->resetJointsOnDetach(mesh_id);
 		}
-        if (mControlAvatar)
+        if (getControlAvatar())
         {
-            LLControlAvatar *av = mControlAvatar;
-            mControlAvatar = NULL;
-            av->markDead();
+            unlinkControlAvatar();
         }
 
 		// Mark itself as dead
@@ -2917,6 +2915,55 @@ void LLViewerObject::fetchInventoryFromServer()
 	}
 }
 
+LLControlAvatar *LLViewerObject::getControlAvatar()
+{
+    return getRootEdit()->mControlAvatar.get();
+}
+
+LLControlAvatar *LLViewerObject::getControlAvatar() const
+{
+    return getRootEdit()->mControlAvatar.get();
+}
+
+void LLViewerObject::linkControlAvatar()
+{
+    if (!getControlAvatar() && isRootEdit())
+    {
+        LLVOVolume *volp = dynamic_cast<LLVOVolume*>(this);
+        if (!volp)
+        {
+            LL_WARNS() << "called with null or non-volume object" << LL_ENDL;
+            return;
+        }
+        mControlAvatar = LLControlAvatar::createControlAvatar(volp);
+    }
+    if (getControlAvatar())
+    {
+        getControlAvatar()->addAttachmentOverridesForObject(this);
+    }
+    else
+    {
+        LL_WARNS() << "no control avatar found!" << LL_ENDL;
+    }
+}
+
+void LLViewerObject::unlinkControlAvatar()
+{
+    if (getControlAvatar())
+    {
+        getControlAvatar()->resetJointsOnDetach(this);
+    }
+    if (isRootEdit())
+    {
+        // This will remove the entire linkset from the control avatar
+        LLControlAvatar *av = mControlAvatar;
+        mControlAvatar = NULL;
+        av->markDead();
+    }
+    // For non-root prims, removing from the linkset will
+    // automatically remove the control avatar connection.
+}
+
 struct LLFilenameAndTask
 {
 	LLUUID mTaskID;
@@ -3872,7 +3919,7 @@ const LLVector3 LLViewerObject::getRenderPosition() const
 	if (mDrawable.notNull() && mDrawable->isState(LLDrawable::RIGGED))
 	{
 		LLVOAvatar* avatar = getAvatar();
-		if (avatar && !mControlAvatar)
+		if (avatar && !getControlAvatar())
 		{
 			return avatar->getPositionAgent();
 		}
@@ -4008,9 +4055,9 @@ void LLViewerObject::setPosition(const LLVector3 &pos, BOOL damped)
 		// position caches need to be up to date on root objects
 		updatePositionCaches();
 	}
-    if (mControlAvatar)
+    if (getControlAvatar() && isRootEdit())
     {
-        mControlAvatar->matchVolumeTransform();
+        getControlAvatar()->matchVolumeTransform();
     }
 }
 
@@ -6377,9 +6424,9 @@ const std::string& LLViewerObject::getAttachmentItemName() const
 //virtual
 LLVOAvatar* LLViewerObject::getAvatar() const
 {
-    if (mControlAvatar)
+    if (getControlAvatar())
     {
-        return mControlAvatar;
+        return getControlAvatar();
     }
 	if (isAttachment())
 	{
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index e727567957..bef00e2bab 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -684,6 +684,17 @@ public:
 
 	static			BOOL		sUseSharedDrawables;
 
+public:
+    // Returns mControlAvatar for the edit root prim of this linkset
+    LLControlAvatar *getControlAvatar();
+    LLControlAvatar *getControlAvatar() const;
+
+    // Create or connect to an existing control av as applicable
+    void linkControlAvatar();
+    // Remove any reference to control av for this prim
+    void unlinkControlAvatar();
+    
+private:
     LLPointer<LLControlAvatar> mControlAvatar;
 
 protected:
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index beb6f08899..c268ab5f3c 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3433,7 +3433,7 @@ void LLVOAvatar::updateDebugText()
                     {
                         LLControlAvatar *control_av = dynamic_cast<LLControlAvatar*>(this);
                         // Try to get name from inventory of associated object
-                        LLVOVolume *volp = control_av->mVolp;
+                        LLVOVolume *volp = control_av->mRootVolp;
                         if (volp)
                         {
                             volp->requestInventory(); // AXON should be a no-op if already requested or fetched?
@@ -5565,14 +5565,14 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
 {
     bool non_attached_case = false;
     // FIXME AXON - will this work if vo has child objects?
-    if (vo->mControlAvatar)
+    if (vo->getControlAvatar())
     {
         non_attached_case = true;
     }
     LLVOAvatar *av;
     if (non_attached_case)
     {
-        av = vo->mControlAvatar;
+        av = vo->getControlAvatar();
     }
     else
     {
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 150769845b..da24d9f9c2 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3311,6 +3311,10 @@ void LLVOVolume::setExtendedMeshFlags(U32 flags)
 bool LLVOVolume::canBeAnimatedObject() const
 {
     if (!isMesh())
+    {
+        return false;
+    }
+    if (isAttachment())
     {
         return false;
     }
@@ -4830,20 +4834,24 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
                           vobj->isMesh() && 
 						  gMeshRepo.getSkinInfo(vobj->getVolume()->getParams().getSculptID(), vobj);
 
-            bool rigged_non_attachment = !vobj->isAttachment() &&
-                                         vobj->isMesh() && 
-                                         gMeshRepo.getSkinInfo(vobj->getVolume()->getParams().getSculptID(), vobj);
-
-            if (rigged_non_attachment)
+            if (vobj->isAnimatedObject())
             {
-                if (!vobj->mControlAvatar)
+                if (!vobj->getControlAvatar())
                 {
-                    vobj->mControlAvatar = LLControlAvatar::createControlAvatar(vobj);
-                    vobj->mControlAvatar->addAttachmentOverridesForObject(vobj);
+                    vobj->linkControlAvatar();
                 }
-                if (vobj->mControlAvatar)
+                if (vobj->getControlAvatar())
+                {
+                    pAvatarVO = vobj->getControlAvatar();
+                }
+            }
+            else
+            {
+                // Not animated but has a control avatar - probably
+                // the checkbox has changed since the last rebuild.
+                if (vobj->getControlAvatar())
                 {
-                    pAvatarVO = vobj->mControlAvatar;
+                    vobj->unlinkControlAvatar();
                 }
             }
 
@@ -4880,7 +4888,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 				//sum up face verts and indices
 				drawablep->updateFaceSize(i);
 			
-				if (rigged || (vobj->mControlAvatar && vobj->mControlAvatar->mPlaying))
+				if (rigged || (vobj->getControlAvatar() && vobj->getControlAvatar()->mPlaying))
 				{
 					if (!facep->isState(LLFace::RIGGED))
 					{ //completely reset vertex buffer
-- 
cgit v1.3


From a09cc5f4bb9ccf93db7233d0b1fd0142803b2f23 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 30 Jun 2017 20:49:23 +0100
Subject: 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.

---
 indra/newview/llcontrolavatar.cpp |  6 ++++
 indra/newview/llcontrolavatar.h   |  2 ++
 indra/newview/llviewermessage.cpp |  6 ++--
 indra/newview/llviewerobject.cpp  | 17 +++++----
 indra/newview/llvoavatar.cpp      | 76 +++++++++++++++++++--------------------
 indra/newview/llvoavatar.h        |  4 +--
 indra/newview/llvovolume.cpp      |  2 +-
 7 files changed, 60 insertions(+), 53 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 6fc3d52fe7..bd99f66459 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -183,4 +183,10 @@ void LLControlAvatar::idleUpdate(LLAgent &agent, const F64 &time)
     }
 }
 
+//virtual
+void LLControlAvatar::updateDebugText()
+{
+    addDebugText("I'm a control avatar");
 
+    LLVOAvatar::updateDebugText();
+}
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index 5cca0ab9dd..fc7b4aa06d 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -52,6 +52,8 @@ public:
 
     virtual void idleUpdate(LLAgent &agent, const F64 &time);
     
+	virtual void	updateDebugText();
+
     bool mPlaying;
 
     F32 mGlobalScale;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f8cdb5bf92..227c6afcb0 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5105,7 +5105,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     }
     
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
-	LL_WARNS() << "AXON handle object animation here, num_blocks " << num_blocks << LL_ENDL;
+	LL_DEBUGS("AXON") << "handle object animation here, num_blocks " << num_blocks << LL_ENDL;
 
     if (!avatarp->mPlaying)
     {
@@ -5119,13 +5119,13 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
         avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
-        LL_INFOS() << "AXON got object animation request for object " 
+        LL_DEBUGS("AXON") << "got object animation request for object " 
                    << uuid << " animation id " << animation_id << LL_ENDL;
     }
 
 	if (num_blocks >= 0)
 	{
-        LL_INFOS() << "AXON process animation state changes here" << LL_ENDL;
+        LL_DEBUGS("AXON") << "process animation state changes here" << LL_ENDL;
 		avatarp->processAnimationStateChanges();
 	}
 }
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)
 	{
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 4ed924f828..9a1629fbfb 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1409,13 +1409,29 @@ void LLVOAvatar::renderCollisionVolumes()
         static F32 sphere_scale = 1.0f;
         static F32 center_dot_scale = 0.05f;
 
-        static LLVector3 CV_COLOR_OCCLUDED(0.0f, 0.0f, 1.0f);
-        static LLVector3 CV_COLOR_VISIBLE(0.5f, 0.5f, 1.0f);
-        static LLVector3 DOT_COLOR_OCCLUDED(1.0f, 1.0f, 1.0f);
-        static LLVector3 DOT_COLOR_VISIBLE(1.0f, 1.0f, 1.0f);
+        static LLVector3 BLUE(0.0f, 0.0f, 1.0f);
+        static LLVector3 PASTEL_BLUE(0.5f, 0.5f, 1.0f);
+        static LLVector3 RED(1.0f, 0.0f, 0.0f);
+        static LLVector3 PASTEL_RED(1.0f, 0.5f, 0.5f);
+        static LLVector3 WHITE(1.0f, 1.0f, 1.0f);
+        
 
-        render_sphere_and_line(begin_pos, end_pos, sphere_scale, CV_COLOR_OCCLUDED, CV_COLOR_VISIBLE);
-        render_sphere_and_line(begin_pos, end_pos, center_dot_scale, DOT_COLOR_OCCLUDED, DOT_COLOR_VISIBLE);
+        LLVector3 cv_color_occluded;
+        LLVector3 cv_color_visible;
+        LLVector3 dot_color_occluded(WHITE);
+        LLVector3 dot_color_visible(WHITE);
+        if (isControlAvatar())
+        {
+            cv_color_occluded = RED;
+            cv_color_visible = PASTEL_RED;
+        }
+        else
+        {
+            cv_color_occluded = BLUE;
+            cv_color_visible = PASTEL_BLUE;
+        }
+        render_sphere_and_line(begin_pos, end_pos, sphere_scale, cv_color_occluded, cv_color_visible);
+        render_sphere_and_line(begin_pos, end_pos, center_dot_scale, dot_color_occluded, dot_color_visible);
 
         gGL.popMatrix();
     }
@@ -1427,9 +1443,6 @@ void LLVOAvatar::renderCollisionVolumes()
 	
 		mNameText->lineSegmentIntersect(unused, unused, unused, TRUE);
 	}
-
-	mDebugText.clear();
-	addDebugText(ostr.str());
 }
 
 void LLVOAvatar::renderBones()
@@ -3357,8 +3370,7 @@ bool LLVOAvatar::isInMuteList()
 
 void LLVOAvatar::updateDebugText()
 {
-	// clear debug text
-	mDebugText.clear();
+    // Leave mDebugText uncleared here, in case a derived class has added some state first
 
 	if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
 	{
@@ -3482,8 +3494,7 @@ void LLVOAvatar::updateDebugText()
 	{
 		setDebugText(mDebugText);
 	}
-	mDebugText.clear();
-
+    mDebugText.clear();
 }
 
 //------------------------------------------------------------------------
@@ -5579,28 +5590,13 @@ void LLVOAvatar::rebuildAttachmentOverrides()
 //-----------------------------------------------------------------------------
 void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
 {
-    bool non_attached_case = false;
-    // FIXME AXON - will this work if vo has child objects?
-    if (vo->getControlAvatar())
-    {
-        non_attached_case = true;
-    }
-    LLVOAvatar *av;
-    if (non_attached_case)
-    {
-        av = vo->getControlAvatar();
-    }
-    else
+    if (vo->getAvatar() != this)
     {
-        av = vo->getAvatarAncestor();
-	if (!av || (av != this))
-	{
 		LL_WARNS("Avatar") << "called with invalid avatar" << LL_ENDL;
         return;
-	}
     }
 
-    LLScopedContextString str("addAttachmentOverridesForObject " + av->getFullname());
+    LLScopedContextString str("addAttachmentOverridesForObject " + vo->getAvatar()->getFullname());
     
 	// Process all children
 	LLViewerObject::const_child_list_t& children = vo->getChildren();
@@ -5626,7 +5622,7 @@ void LLVOAvatar::addAttachmentOverridesForObject(LLViewerObject *vo)
 	LLUUID currentId = vobj->getVolume()->getParams().getSculptID();						
 	const LLMeshSkinInfo*  pSkinData = gMeshRepo.getSkinInfo( currentId, vobj );
 
-	if ( vobj && (vobj->isAttachment()||non_attached_case) && vobj->isMesh() && pSkinData )
+	if ( vobj && vobj->isMesh() && pSkinData )
 	{
 		const int bindCnt = pSkinData->mAlternateBindMatrix.size();								
         const int jointCnt = pSkinData->mJointNames.size();
@@ -5808,15 +5804,15 @@ void LLVOAvatar::showAttachmentOverrides(bool verbose) const
 }
 
 //-----------------------------------------------------------------------------
-// resetJointsOnDetach
+// removeAttachmentOverridesForObject
 //-----------------------------------------------------------------------------
 // AXON handle NPC case
-void LLVOAvatar::resetJointsOnDetach(LLViewerObject *vo)
+void LLVOAvatar::removeAttachmentOverridesForObject(LLViewerObject *vo)
 {
-	LLVOAvatar *av = vo->getAvatarAncestor();
-	if (!av || (av != this))
+	if (vo->getAvatar() != this)
 	{
 		LL_WARNS("Avatar") << "called with invalid avatar" << LL_ENDL;
+        return;
 	}
 		
 	// Process all children
@@ -5825,22 +5821,22 @@ void LLVOAvatar::resetJointsOnDetach(LLViewerObject *vo)
 		 it != children.end(); ++it)
 	{
 		LLViewerObject *childp = *it;
-		resetJointsOnDetach(childp);
+		removeAttachmentOverridesForObject(childp);
 	}
 
 	// Process self.
 	LLUUID mesh_id;
 	if (getRiggedMeshID(vo,mesh_id))
 	{
-		resetJointsOnDetach(mesh_id);
+		removeAttachmentOverridesForObject(mesh_id);
 	}
 }
 
 //-----------------------------------------------------------------------------
-// resetJointsOnDetach
+// removeAttachmentOverridesForObject
 //-----------------------------------------------------------------------------
 // AXON handle NPC case
-void LLVOAvatar::resetJointsOnDetach(const LLUUID& mesh_id)
+void LLVOAvatar::removeAttachmentOverridesForObject(const LLUUID& mesh_id)
 {	
 	//Subsequent joints are relative to pelvis
 	avatar_joint_list_t::iterator iter = mSkeleton.begin();
@@ -6559,7 +6555,7 @@ void LLVOAvatar::cleanupAttachedMesh( LLViewerObject* pVO )
 	LLUUID mesh_id;
 	if (getRiggedMeshID(pVO, mesh_id))
 	{
-		resetJointsOnDetach(mesh_id);
+		removeAttachmentOverridesForObject(mesh_id);
 		if ( gAgentCamera.cameraCustomizeAvatar() )
 		{
 			gAgent.unpauseAnimation();
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 2b71cfbe61..406b9d8a22 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -202,8 +202,8 @@ public:
 	LLJoint*		        getJoint(S32 num);
 	
 	void 					addAttachmentOverridesForObject(LLViewerObject *vo);
-	void					resetJointsOnDetach(const LLUUID& mesh_id);
-	void					resetJointsOnDetach(LLViewerObject *vo);
+	void					removeAttachmentOverridesForObject(const LLUUID& mesh_id);
+	void					removeAttachmentOverridesForObject(LLViewerObject *vo);
     bool					jointIsRiggedTo(const std::string& joint_name);
     bool					jointIsRiggedTo(const std::string& joint_name, const LLViewerObject *vo);
 	void					clearAttachmentOverrides();
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 911575138b..94556a9f70 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3415,7 +3415,7 @@ void LLVOVolume::updateAnimatedObjectState(LLViewerObject *old_parent, LLViewerO
     if (old_volp && old_volp->isAnimatedObject())
     {
         // W have been removed from an animated object, need to do cleanup.
-        old_volp->getControlAvatar()->resetJointsOnDetach(this);
+        old_volp->getControlAvatar()->removeAttachmentOverridesForObject(this);
     }
     
     if (old_volp)
-- 
cgit v1.3


From f55667397e75991348fa25b6ad581a36de99acf0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 6 Jul 2017 01:25:10 +0100
Subject: SL-722 - handle per-object animation requests, combine for control
 avatar animation state.

---
 indra/newview/app_settings/logcontrol.xml       |  1 +
 indra/newview/llcontrolavatar.cpp               | 64 +++++++++++++++++++++++++
 indra/newview/llcontrolavatar.h                 |  3 ++
 indra/newview/llviewermessage.cpp               | 13 ++---
 indra/newview/llvoavatar.cpp                    |  1 +
 indra/newview/llvovolume.h                      |  5 ++
 scripts/testing/lsl/cycle_object_animations.lsl |  6 +--
 7 files changed, 82 insertions(+), 11 deletions(-)

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

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index ecd7c4bc36..ddd07dba80 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -50,6 +50,7 @@
 						</array>
 					<key>tags</key>
 						<array>
+                          <string>AXON</string>
 						<!-- sample entry for debugging specific items	
 						     <string>Avatar</string>
 						     <string>Inventory</string>
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index bd99f66459..f18d1c636a 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -190,3 +190,67 @@ void LLControlAvatar::updateDebugText()
 
     LLVOAvatar::updateDebugText();
 }
+
+void LLControlAvatar::getAnimatedVolumes(std::vector<LLVOVolume*>& volumes)
+{
+    if (!mRootVolp)
+    {
+        return;
+    }
+
+    volumes.push_back(mRootVolp);
+    
+	LLViewerObject::const_child_list_t& child_list = mRootVolp->getChildren();
+	for (LLViewerObject::const_child_list_t::const_iterator iter = child_list.begin();
+		 iter != child_list.end(); ++iter)
+	{
+		LLViewerObject* childp = *iter;
+        LLVOVolume *child_volp = dynamic_cast<LLVOVolume*>(childp);
+        if (child_volp && child_volp->isAnimatedObject())
+        {
+            volumes.push_back(child_volp);
+        }
+    }
+}
+
+// This is called after an associated object receives an animation
+// message. Combine the signaled animations for all associated objects
+// and process any resulting state changes.
+void LLControlAvatar::updateAnimations()
+{
+    if (!mRootVolp)
+    {
+        LL_WARNS("AXON") << "No root vol" << LL_ENDL;
+        return;
+    }
+
+    std::vector<LLVOVolume*> volumes;
+    getAnimatedVolumes(volumes);
+    
+    // Rebuild mSignaledAnimations from the associated volumes.
+	std::map<LLUUID, S32> anims;
+    for (std::vector<LLVOVolume*>::iterator vol_it = volumes.begin(); vol_it != volumes.end(); ++vol_it)
+    {
+        LLVOVolume *volp = *vol_it;
+        for (std::map<LLUUID,S32>::iterator anim_it = volp->mObjectSignaledAnimations.begin();
+             anim_it != volp->mObjectSignaledAnimations.end();
+             ++anim_it)
+        {
+            std::map<LLUUID,S32>::iterator found_anim_it = anims.find(anim_it->first);
+            if (found_anim_it != anims.end())
+            {
+                // Animation already present, use the larger sequence id
+                anims[anim_it->first] = llmax(found_anim_it->second, anim_it->second);
+            }
+            else
+            {
+                // Animation not already present, use this sequence id.
+                anims[anim_it->first] = anim_it->second;
+            }
+        }
+    }
+    mSignaledAnimations = anims;
+
+    LL_DEBUGS("AXON") << "process animation state changes here" << LL_ENDL;
+    processAnimationStateChanges();
+}
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index fc7b4aa06d..1be2d58441 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -51,6 +51,9 @@ public:
     void markForDeath();
 
     virtual void idleUpdate(LLAgent &agent, const F64 &time);
+
+    void getAnimatedVolumes(std::vector<LLVOVolume*>& volumes);
+    void updateAnimations();  
     
 	virtual void	updateDebugText();
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 227c6afcb0..ba4c632586 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5112,22 +5112,19 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         avatarp->mPlaying = true;
 		avatarp->updateVolumeGeom();
     }
-	avatarp->mSignaledAnimations.clear();
+
+	volp->mObjectSignaledAnimations.clear();
 	
     for( S32 i = 0; i < num_blocks; i++ )
     {
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
-        avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
+        volp->mObjectSignaledAnimations[animation_id] = anim_sequence_id;
         LL_DEBUGS("AXON") << "got object animation request for object " 
-                   << uuid << " animation id " << animation_id << LL_ENDL;
+                          << uuid << " animation id " << animation_id << LL_ENDL;
     }
 
-	if (num_blocks >= 0)
-	{
-        LL_DEBUGS("AXON") << "process animation state changes here" << LL_ENDL;
-		avatarp->processAnimationStateChanges();
-	}
+    avatarp->updateAnimations();
 }
 
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 9a1629fbfb..b202f1b848 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -721,6 +721,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 
 	mCurrentGesticulationLevel = 0;
 
+    
 	mRuthTimer.reset();
 	mRuthDebugTimer.reset();
 	mDebugExistenceTimer.reset();
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 27a51d100f..3c0c9facb1 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -274,6 +274,11 @@ public:
     bool isAnimatedObjectStateConsistent() const;
     void updateAnimatedObjectState(LLViewerObject *old_parent, LLViewerObject *new_parent);
 
+    // AXON For animated objects, we need to track animations requested
+    // per-object, then reconcile those to manage the control avatar
+    // animation state.
+	std::map<LLUUID, S32> 					mObjectSignaledAnimations; // requested state of Animation name/value
+
     // Functions that deal with media, or media navigation
     
     // Update this object's media data with the given media data array
diff --git a/scripts/testing/lsl/cycle_object_animations.lsl b/scripts/testing/lsl/cycle_object_animations.lsl
index 95fa99a191..79c8ff4151 100644
--- a/scripts/testing/lsl/cycle_object_animations.lsl
+++ b/scripts/testing/lsl/cycle_object_animations.lsl
@@ -9,17 +9,17 @@ cycle_animations()
         ItemName = llGetInventoryName(INVENTORY_ANIMATION, count);
         if (NowPlaying != "")
         {
-            llSay(0, "Stopping " + NowPlaying);
+            //llSay(0, "Stopping " + NowPlaying);
             llStopObjectAnimation(NowPlaying);
         }
-        llSay(0, "Starting " + ItemName);
+        //llSay(0, "Starting " + ItemName);
         llStartObjectAnimation(ItemName);
         NowPlaying = ItemName;
         llSleep(10);
     }
     if (NowPlaying != "")
     {
-        llSay(0, "Stopping " + NowPlaying);
+        //llSay(0, "Stopping " + NowPlaying);
         llStopObjectAnimation(NowPlaying);
         llSleep(10);
     }
-- 
cgit v1.3


From c025939e42d4c26054ff4a6eeded4b7849c74070 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 27 Oct 2017 15:10:26 +0100
Subject: MAINT-7857 - shadow fix for animated objects.

---
 indra/newview/lldrawpoolavatar.cpp |  2 +-
 indra/newview/llviewermessage.cpp  | 33 +++++++++++++++++++++++++++++++++
 indra/newview/llvovolume.cpp       | 10 +++++++---
 3 files changed, 41 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index b39b2cd6e5..30560eeb7b 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -468,7 +468,7 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
 	LLVOAvatar *avatarp = (LLVOAvatar *)facep->getDrawable()->getVObj().get();
 
 // AXON fix
-	if (avatarp->isDead() || avatarp->mIsDummy || avatarp->mDrawable.isNull())
+	if (avatarp->isDead() || (avatarp->mIsDummy && !avatarp->isControlAvatar()) || avatarp->mDrawable.isNull())
 	{
 		return;
 	}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 70202e4bc6..fad59aadf4 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5075,6 +5075,18 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	}
 }
 
+// AXON Move to llviewerobject
+void recursiveMarkForUpdate(LLViewerObject *vobj, BOOL priority)
+{
+    for (LLViewerObject::child_list_t::const_iterator iter = vobj->getChildren().begin();
+         iter != vobj->getChildren().end(); iter++)
+    {
+        LLViewerObject* child = (LLViewerObject*)*iter;
+        child->markForUpdate(priority);
+    }
+    vobj->markForUpdate(priority);
+}
+
 void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 {
 	LLUUID	animation_id;
@@ -5113,11 +5125,32 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
 	LL_DEBUGS("AXON") << "handle object animation here, num_blocks " << num_blocks << LL_ENDL;
 
+#if 1 
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
 		avatarp->updateVolumeGeom();
+        recursiveMarkForUpdate(avatarp->mRootVolp,TRUE);
     }
+#else
+    if (num_blocks > 0 && !avatarp->mPlaying)
+    {
+        avatarp->mPlaying = true;
+		avatarp->updateVolumeGeom();
+        // AXON FIXME need to update all objects in the linkset, not just the one where animation is playing
+        recursiveMarkForUpdate(avatarp->mRootVolp,TRUE);
+    }
+    else if (num_blocks == 0 && avatarp->mPlaying)
+    {
+        // AXON this will cause meshes to go back to static when no
+        // animations are signalled. Probably don't want to leave this
+        // way but helpful for testing.
+        avatarp->mPlaying = false;
+		avatarp->updateVolumeGeom();
+        // AXON FIXME need to update all objects in the linkset, not just the one where animation is playing
+        recursiveMarkForUpdate(avatarp->mRootVolp,TRUE);
+    }
+#endif
 
 	volp->mObjectSignaledAnimations.clear();
 	
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index c9bf609940..d4a601d394 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5089,8 +5089,12 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 
 			drawablep->clearState(LLDrawable::HAS_ALPHA);
 
-            // AXON this includes attached animeshes but leaves out standalone ones. Fix.
-			bool rigged = vobj->isRiggedMesh() && vobj->isAttachment();
+            // Standard rigged mesh attachments: 
+			bool rigged = !vobj->isAnimatedObject() && vobj->isRiggedMesh() && vobj->isAttachment();
+            // Animated objects. Have to check for isRiggedMesh() to
+            // exclude static objects in animated object linksets.
+			rigged = rigged || (vobj->isAnimatedObject() && vobj->isRiggedMesh() &&
+                vobj->getControlAvatar() && vobj->getControlAvatar()->mPlaying);
 
             if (vobj->isAnimatedObject())
             {
@@ -5149,7 +5153,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 				//sum up face verts and indices
 				drawablep->updateFaceSize(i);
 			
-				if (rigged || (vobj->getControlAvatar() && vobj->getControlAvatar()->mPlaying && vobj->isMesh()))
+				if (rigged)
 				{
 					if (!facep->isState(LLFace::RIGGED))
 					{ //completely reset vertex buffer
-- 
cgit v1.3


From ef0e3bfdd92bb5faea633a14487f123dfeb2f5f1 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 27 Oct 2017 21:27:36 +0100
Subject: SL-731, SL-779 - more diagnostics for DebugAnimatedObjects, fixed a
 problem with recursiveMarkForUpdate

---
 indra/newview/llcontrolavatar.cpp | 21 ++++++++++++++++++---
 indra/newview/llviewermessage.cpp | 22 +++++-----------------
 indra/newview/llviewerobject.cpp  | 11 +++++++++++
 indra/newview/llviewerobject.h    |  3 ++-
 indra/newview/llvovolume.cpp      |  4 ++--
 5 files changed, 38 insertions(+), 23 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index fab95ab1d8..51dc7d7de1 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -227,6 +227,7 @@ void LLControlAvatar::updateDebugText()
         getAnimatedVolumes(volumes);
         S32 animated_volume_count = volumes.size();
         std::string active_string;
+        std::string type_string;
         std::string lod_string;
         S32 total_tris = 0;
         S32 total_verts = 0;
@@ -248,16 +249,31 @@ void LLControlAvatar::updateDebugText()
                 {
                     active_string += "S";
                 }
+                if (volp->isRiggedMesh())
+                {
+                    // Rigged/animateable mesh
+                    type_string += "R";
+                }
+                else if (volp->isMesh())
+                {
+                    // Static mesh
+                    type_string += "M";
+                }
+                else
+                {
+                    // Any other prim
+                    type_string += "P";
+                }
             }
             else
             {
                 active_string += "-";
+                type_string += "-";
             }
         }
         addDebugText(llformat("CAV obj %d anim %d active %s",
                               total_linkset_count, animated_volume_count, active_string.c_str()));
-
-        addDebugText(llformat("lod %s",lod_string.c_str()));
+        addDebugText(llformat("types %s lods %s", type_string.c_str(), lod_string.c_str()));
         addDebugText(llformat("tris %d verts %d", total_tris, total_verts));
         //addDebugText(llformat("anim time %.1f (step %f factor %f)", 
         //                      mMotionController.getAnimTime(),
@@ -329,7 +345,6 @@ void LLControlAvatar::updateAnimations()
     }
     mSignaledAnimations = anims;
 
-    LL_DEBUGS("AXON") << "process animation state changes here" << LL_ENDL;
     processAnimationStateChanges();
 }
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index fad59aadf4..3834082f78 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5075,18 +5075,6 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	}
 }
 
-// AXON Move to llviewerobject
-void recursiveMarkForUpdate(LLViewerObject *vobj, BOOL priority)
-{
-    for (LLViewerObject::child_list_t::const_iterator iter = vobj->getChildren().begin();
-         iter != vobj->getChildren().end(); iter++)
-    {
-        LLViewerObject* child = (LLViewerObject*)*iter;
-        child->markForUpdate(priority);
-    }
-    vobj->markForUpdate(priority);
-}
-
 void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 {
 	LLUUID	animation_id;
@@ -5123,14 +5111,14 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     }
     
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
-	LL_DEBUGS("AXON") << "handle object animation here, num_blocks " << num_blocks << LL_ENDL;
+	LL_DEBUGS("AXON") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL;
 
-#if 1 
+#if 0 
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
 		avatarp->updateVolumeGeom();
-        recursiveMarkForUpdate(avatarp->mRootVolp,TRUE);
+        avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
     }
 #else
     if (num_blocks > 0 && !avatarp->mPlaying)
@@ -5138,7 +5126,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         avatarp->mPlaying = true;
 		avatarp->updateVolumeGeom();
         // AXON FIXME need to update all objects in the linkset, not just the one where animation is playing
-        recursiveMarkForUpdate(avatarp->mRootVolp,TRUE);
+        avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
     }
     else if (num_blocks == 0 && avatarp->mPlaying)
     {
@@ -5148,7 +5136,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         avatarp->mPlaying = false;
 		avatarp->updateVolumeGeom();
         // AXON FIXME need to update all objects in the linkset, not just the one where animation is playing
-        recursiveMarkForUpdate(avatarp->mRootVolp,TRUE);
+        avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
     }
 #endif
 
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 8e50f2dc08..b17d83486f 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -6020,6 +6020,17 @@ void LLViewerObject::updateVolume(const LLVolumeParams& volume_params)
 	}
 }
 
+void LLViewerObject::recursiveMarkForUpdate(BOOL priority)
+{
+    for (LLViewerObject::child_list_t::iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        LLViewerObject* child = *iter;
+        child->markForUpdate(priority);
+    }
+    markForUpdate(priority);
+}
+
 void LLViewerObject::markForUpdate(BOOL priority)
 {
 	if (mDrawable.notNull())
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 09b87e4a3a..a3a9a075ba 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -419,7 +419,8 @@ public:
 	void setIcon(LLViewerTexture* icon_image);
 	void clearIcon();
 
-	void markForUpdate(BOOL priority);
+    void recursiveMarkForUpdate(BOOL priority);
+	virtual void markForUpdate(BOOL priority);
 	void updateVolume(const LLVolumeParams& volume_params);
 	virtual	void updateSpatialExtents(LLVector4a& min, LLVector4a& max);
 	virtual F32 getBinRadius();
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index d4a601d394..004f335a5a 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3403,7 +3403,7 @@ bool LLVOVolume::canBeAnimatedObject() const
     F32 est_tris = recursiveGetEstTrianglesMax();
     if (est_tris <= 0 || est_tris > getAnimatedObjectMaxTris())
     {
-        LL_INFOS() << "est_tris " << est_tris << " is outside limit of 1-" << getAnimatedObjectMaxTris() << LL_ENDL;
+        LL_DEBUGS("AXON") << "est_tris " << est_tris << " is outside limit of 1-" << getAnimatedObjectMaxTris() << LL_ENDL;
         return false;
     }
     return true;
@@ -3987,7 +3987,7 @@ void LLVOVolume::parameterChanged(U16 param_type, LLNetworkData* data, BOOL in_u
         bool was_enabled = (getControlAvatar() != NULL);
         if (enabled != was_enabled)
         {
-            LL_INFOS() << (U32) this
+            LL_DEBUGS("AXON") << (U32) this
                        << " calling onSetExtendedMeshFlags, enabled " << (U32) enabled
                        << " was_enabled " << (U32) was_enabled
                        << " local_origin " << (U32) local_origin
-- 
cgit v1.3


From ae40b68ba7fb9ea9c308c0dcb01d19e3d218aeaa Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 1 Nov 2017 22:07:42 +0100
Subject: SL-830, SL-831 - no linking if any of the roots is animated object.
 isAnimatedObject() just uses check against extended mesh flag of the root. On
 select, LLVOVolume marks whole linkset for update if animated object.

---
 indra/newview/llselectmgr.cpp     | 21 +++++++++++++++++----
 indra/newview/llselectmgr.h       |  1 +
 indra/newview/llviewermessage.cpp |  2 +-
 indra/newview/llvovolume.cpp      | 18 ++++++++++++++----
 4 files changed, 33 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 81fd228997..e8b2d1ec8c 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -691,7 +691,7 @@ bool LLSelectMgr::enableLinkObjects()
 			new_value = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
 		}
 	}
-    if (!LLSelectMgr::getInstance()->getSelection()->checkAnimatedObjectEstTris())
+    if (!LLSelectMgr::getInstance()->getSelection()->checkAnimatedObjectLinkable())
     {
         new_value = false;
     }
@@ -7434,10 +7434,9 @@ bool LLObjectSelection::checkAnimatedObjectEstTris()
     F32 est_tris = 0;
     F32 max_tris = 0;
     S32 anim_count = 0;
-	for (root_iterator iter = root_begin(); iter != root_end(); )
+	for (root_iterator iter = root_begin(); iter != root_end(); ++iter)
 	{
-		root_iterator nextiter = iter++;
-		LLViewerObject* object = (*nextiter)->getObject();
+		LLViewerObject* object = (*iter)->getObject();
 		if (!object)
 			continue;
         if (object->isAnimatedObject())
@@ -7450,6 +7449,20 @@ bool LLObjectSelection::checkAnimatedObjectEstTris()
 	return anim_count==0 || est_tris <= max_tris;
 }
 
+bool LLObjectSelection::checkAnimatedObjectLinkable()
+{
+    // Can't link if any of the roots is currently an animated object
+	for (root_iterator iter = root_begin(); iter != root_end(); ++iter)
+	{
+        LLViewerObject* objectp = (*iter)->getObject();
+        if (objectp && objectp->isAnimatedObject())
+        {
+            return false;
+        }
+	}
+	return true;
+}
+
 bool LLObjectSelection::applyToRootObjects(LLSelectedObjectFunctor* func, bool firstonly)
 {
 	bool result = firstonly ? false : true;
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 4e79cb003d..fcbfd5fccd 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -341,6 +341,7 @@ public:
 
     // AXON validate a potential link against limits
     bool checkAnimatedObjectEstTris();
+    bool checkAnimatedObjectLinkable();
     
 	// Apply functors to various subsets of the selected objects
 	// If firstonly is FALSE, returns the AND of all apply() calls.
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 3834082f78..0f567ba5ac 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5113,7 +5113,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
 	LL_DEBUGS("AXON") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL;
 
-#if 0 
+#if 1 
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 004f335a5a..bb28d5d83e 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3413,6 +3413,8 @@ bool LLVOVolume::isAnimatedObject() const
 {
     LLVOVolume *root_vol = (LLVOVolume*)getRootEdit();
     bool root_is_animated_flag = root_vol->getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG;
+    return root_is_animated_flag;
+#if 0
     if (root_is_animated_flag)
     {
         bool root_can_be_animated = root_vol->canBeAnimatedObject();
@@ -3423,6 +3425,7 @@ bool LLVOVolume::isAnimatedObject() const
         }
     }
     return false;
+#endif
 }
 
 // Make sure animated objects in a linkset are consistent. The rules are:
@@ -4008,10 +4011,17 @@ void LLVOVolume::parameterChanged(U16 param_type, LLNetworkData* data, BOOL in_u
 void LLVOVolume::setSelected(BOOL sel)
 {
 	LLViewerObject::setSelected(sel);
-	if (mDrawable.notNull())
-	{
-		markForUpdate(TRUE);
-	}
+    if (isAnimatedObject())
+    {
+        getRootEdit()->recursiveMarkForUpdate(TRUE);
+    }
+    else
+    {
+        if (mDrawable.notNull())
+        {
+            markForUpdate(TRUE);
+        }
+    }
 }
 
 void LLVOVolume::updateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
-- 
cgit v1.3


From e8fe39f33266c96797ca976978b24bf9cd778f8c Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 6 Nov 2017 14:02:38 +0000
Subject: SL-830 - more diagnostics and possible fixes around corrupted
 graphics state

---
 indra/newview/llviewermessage.cpp | 18 ++++++++++-----
 indra/newview/llviewerobject.cpp  | 12 ++++++++++
 indra/newview/llviewerobject.h    |  2 ++
 indra/newview/llvovolume.cpp      | 48 +++++++++++++++++++++++++++++++++++----
 indra/newview/llvovolume.h        |  2 +-
 indra/newview/pipeline.cpp        | 13 +++++++++++
 6 files changed, 83 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 0f567ba5ac..9de8c81c2b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5124,9 +5124,12 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     if (num_blocks > 0 && !avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
-		avatarp->updateVolumeGeom();
-        // AXON FIXME need to update all objects in the linkset, not just the one where animation is playing
-        avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
+        // AXON need to update all objects in the linkset, not just the one where animation is playing
+        if (!avatarp->mRootVolp->isAnySelected())
+        {
+            avatarp->updateVolumeGeom();
+            avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
+        }
     }
     else if (num_blocks == 0 && avatarp->mPlaying)
     {
@@ -5134,9 +5137,12 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         // animations are signalled. Probably don't want to leave this
         // way but helpful for testing.
         avatarp->mPlaying = false;
-		avatarp->updateVolumeGeom();
-        // AXON FIXME need to update all objects in the linkset, not just the one where animation is playing
-        avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
+        // AXON need to update all objects in the linkset, not just the one where animation is playing
+        if (!avatarp->mRootVolp->isAnySelected())
+        {
+            avatarp->updateVolumeGeom();
+            avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
+        }
     }
 #endif
 
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index b17d83486f..404a771571 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -688,6 +688,18 @@ void LLViewerObject::setNameValueList(const std::string& name_value_list)
 	}
 }
 
+BOOL LLViewerObject::isAnySelected() const
+{
+    bool any_selected = isSelected();
+    for (child_list_t::const_iterator iter = mChildList.begin();
+         iter != mChildList.end(); iter++)
+    {
+        const LLViewerObject* child = *iter;
+        any_selected = any_selected || child->isSelected();
+    }
+    return any_selected;
+}
+
 void LLViewerObject::setSelected(BOOL sel)
 {
 	mUserSelected = sel;
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index a3a9a075ba..0bfc513dc9 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -221,6 +221,8 @@ public:
 	LLViewerRegion* getRegion() const				{ return mRegionp; }
 
 	BOOL isSelected() const							{ return mUserSelected; }
+    // Check whole linkset
+    BOOL isAnySelected() const;
 	virtual void setSelected(BOOL sel);
 
 	const LLUUID &getID() const						{ return mID; }
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 0fc95de618..abef312572 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1349,6 +1349,15 @@ BOOL LLVOVolume::updateLOD()
 
 	if (lod_changed)
 	{
+#if 1
+        // AXON debugging
+        if (isAnimatedObject() && isRiggedMesh())
+        {
+            std::string vobj_name = llformat("Vol%u", (U32) this);
+            F32 est_tris = getEstTrianglesMax();
+            LL_DEBUGS("AXONLinkset") << vobj_name << " updateLOD to " << getLOD() << ", tris " << est_tris << LL_ENDL; 
+        }
+#endif
 		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, FALSE);
 		mLODChanged = TRUE;
 	}
@@ -3350,14 +3359,15 @@ U32 LLVOVolume::getExtendedMeshFlags() const
 
 void LLVOVolume::onSetExtendedMeshFlags(U32 flags)
 {
-    // AXON - the check against mUserSelected is "empirically
+    // AXON - the check against isAnySelected() is "empirically
     // derived": doing rebuildGeom() while in selection trashes the
     // graphics state of animated objects. Skipping this update is OK
     // because we get another one on deselect.
-    if (mDrawable.notNull() && !mUserSelected)
+
+	if (!getRootEdit()->isAnySelected() && mDrawable.notNull())
     {
         // Need to trigger rebuildGeom(), which is where control avatars get created/removed
-        markForUpdate(TRUE);
+        getRootEdit()->recursiveMarkForUpdate(TRUE);
     }
     if (isAttachment() && getAvatarAncestor())
     {
@@ -4130,6 +4140,21 @@ const LLMatrix4& LLVOVolume::getWorldMatrix(LLXformMatrix* xform) const
 	return xform->getWorldMatrix();
 }
 
+void LLVOVolume::markForUpdate(BOOL priority)
+{ 
+#if 1
+	// AXON debugging
+    if (isAnimatedObject() && isRiggedMesh())
+    {
+        std::string vobj_name = llformat("Vol%u", (U32) this);
+        F32 est_tris = getEstTrianglesMax();
+        LL_DEBUGS("AXONLinkset") << vobj_name << " markForUpdate, tris " << est_tris << LL_ENDL; 
+    }
+#endif
+    LLViewerObject::markForUpdate(priority); 
+    mVolumeChanged = TRUE; 
+}
+
 LLVector3 LLVOVolume::agentPositionToVolume(const LLVector3& pos) const
 {
 	LLVector3 ret = pos - getRenderPosition();
@@ -5082,15 +5107,19 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 			}
 
             bool is_mesh = vobj->isMesh();
-            
-            LL_DEBUGS("AXON") << vobj_name << " rebuilding, isAttachment: " << (U32) vobj->isAttachment()
+            F32 est_tris = vobj->getEstTrianglesMax();
+
+#if 1
+            LL_DEBUGS("AXONLinkset") << vobj_name << " rebuilding, isAttachment: " << (U32) vobj->isAttachment()
                               << " is_mesh " << is_mesh
+                              << " est_tris " << est_tris
                               << " is_animated " << vobj->isAnimatedObject()
                               << " can_animate " << vobj->canBeAnimatedObject() 
                               << " cav " << vobj->getControlAvatar() 
                               << " playing " << (U32) (vobj->getControlAvatar() ? vobj->getControlAvatar()->mPlaying : false)
                               << " frame " << LLFrameTimer::getFrameCount()
                               << LL_ENDL;
+#endif
 
 			llassert_always(vobj);
 			vobj->updateTextureVirtualSize(true);
@@ -5633,6 +5662,15 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
 			if (drawablep && !drawablep->isDead() && drawablep->isState(LLDrawable::REBUILD_ALL) && !drawablep->isState(LLDrawable::RIGGED) )
 			{
 				LLVOVolume* vobj = drawablep->getVOVolume();
+#if 1 
+                // AXON debugging
+                if (vobj->isAnimatedObject() && vobj->isRiggedMesh())
+                {
+                    std::string vobj_name = llformat("Vol%u", (U32) vobj);
+                    F32 est_tris = vobj->getEstTrianglesMax();
+                    LL_DEBUGS("AXONLinkset") << vobj_name << " rebuildMesh, tris " << est_tris << LL_ENDL; 
+        }
+#endif
 				vobj->preRebuild();
 
 				if (drawablep->isState(LLDrawable::ANIMATED_CHILD))
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 0a11074a66..f12eb168f6 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -162,7 +162,7 @@ public:
 	/*virtual*/ F32  	getRadius() const						{ return mVObjRadius; };
 				const LLMatrix4& getWorldMatrix(LLXformMatrix* xform) const;
 
-				void	markForUpdate(BOOL priority)			{ LLViewerObject::markForUpdate(priority); mVolumeChanged = TRUE; }
+				void	markForUpdate(BOOL priority);
 				void    faceMappingChanged()                    { mFaceMappingChanged=TRUE; };
 
 	/*virtual*/ void	onShift(const LLVector4a &shift_vector); // Called when the drawable shifts
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 19487c3230..436c0cbf43 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3350,6 +3350,19 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f
 {
 	if (drawablep && !drawablep->isDead() && assertInitialized())
 	{
+#if 1
+        // AXON debugging
+        
+        LLVOVolume *vol_obj = drawablep->getVOVolume();
+        if (vol_obj && vol_obj->isAnimatedObject() && vol_obj->isRiggedMesh())
+        {
+            std::string vobj_name = llformat("Vol%u", (U32) vol_obj);
+            F32 est_tris = vol_obj->getEstTrianglesMax();
+            LL_DEBUGS("AXONLinkset") << vobj_name << " markRebuild, tris " << est_tris 
+                                     << " priority " << (S32) priority << " flag " << std::hex << flag << LL_ENDL; 
+        }
+#endif
+    
 		if (!drawablep->isState(LLDrawable::BUILT))
 		{
 			priority = TRUE;
-- 
cgit v1.3


From 14f429329f5e9c570ff4e79f177f3bb8d0471252 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 7 Nov 2017 13:20:04 +0000
Subject: SL-830 - fix for previously selected animated objects disappearing
 when going static

---
 indra/newview/llviewermessage.cpp | 9 ++++++---
 indra/newview/llvovolume.cpp      | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 9de8c81c2b..0b2931886a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5114,6 +5114,9 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	LL_DEBUGS("AXON") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL;
 
 #if 1 
+    // Here we go into skinned mode once, the first time we get an
+    // animation request, and then stay there. This is probably the
+    // normally desired behavior.
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
@@ -5121,6 +5124,9 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
     }
 #else
+    // AXON
+    // In this block we switch back into static mode when no animations are
+    // playing. This is mostly useful for debugging.
     if (num_blocks > 0 && !avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
@@ -5133,9 +5139,6 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     }
     else if (num_blocks == 0 && avatarp->mPlaying)
     {
-        // AXON this will cause meshes to go back to static when no
-        // animations are signalled. Probably don't want to leave this
-        // way but helpful for testing.
         avatarp->mPlaying = false;
         // AXON need to update all objects in the linkset, not just the one where animation is playing
         if (!avatarp->mRootVolp->isAnySelected())
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index abef312572..9d98822082 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5557,6 +5557,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 			else
 			{
 				drawablep->clearState(LLDrawable::RIGGED);
+                vobj->updateRiggedVolume();
 			}
 		}
 	}
-- 
cgit v1.3


From 2f1b75f03e8066b54d9dae16ab29095752c4ee8a Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 16 Nov 2017 19:24:53 +0000
Subject: SL-704 - first pass cleaning up comments. Also added
 LLControlAvatar::initInstance() as a potential hook for optimizations.

---
 indra/newview/llcontrolavatar.cpp  |  8 +++++++-
 indra/newview/llcontrolavatar.h    |  1 +
 indra/newview/lldrawpoolavatar.cpp |  1 -
 indra/newview/llpanelobject.cpp    |  3 ++-
 indra/newview/llpanelvolume.cpp    |  3 ---
 indra/newview/llselectmgr.cpp      |  6 +++---
 indra/newview/llviewermessage.cpp  | 13 +++++++------
 indra/newview/llviewerobject.cpp   |  2 +-
 indra/newview/llvoavatar.cpp       | 22 +++++++++++-----------
 indra/newview/llvograss.cpp        |  1 -
 indra/newview/llvovolume.cpp       | 17 ++++-------------
 indra/newview/llvovolume.h         |  3 ---
 indra/newview/pipeline.cpp         |  1 -
 13 files changed, 36 insertions(+), 45 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 848a8b0d40..afa6be188d 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -49,6 +49,13 @@ LLControlAvatar::~LLControlAvatar()
 {
 }
 
+// virtual
+void LLControlAvatar::initInstance()
+{
+	// AXON - potential optimizations here - avoid creating system avatar mesh since it's not used.
+    LLVOAvatar::initInstance();
+}
+
 void LLControlAvatar::matchVolumeTransform()
 {
     if (mRootVolp)
@@ -173,7 +180,6 @@ void LLControlAvatar::updateVolumeGeom()
 
 LLControlAvatar *LLControlAvatar::createControlAvatar(LLVOVolume *obj)
 {
-    // AXON Lifted from LLPreviewAnimation
 	LLControlAvatar *cav = (LLControlAvatar*)gObjectList.createObjectViewer(LL_PCODE_LEGACY_AVATAR, gAgent.getRegion(), CO_FLAG_CONTROL_AVATAR);
 
     cav->mRootVolp = obj;
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index 308d431615..a0f7912d24 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -37,6 +37,7 @@ class LLControlAvatar:
 
 public:
     LLControlAvatar(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
+	virtual void 			initInstance(); // Called after construction to initialize the class.
 	virtual	~LLControlAvatar();
 
     void matchVolumeTransform();
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 30560eeb7b..206d4f4c7a 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -467,7 +467,6 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
 	}
 	LLVOAvatar *avatarp = (LLVOAvatar *)facep->getDrawable()->getVObj().get();
 
-// AXON fix
 	if (avatarp->isDead() || (avatarp->mIsDummy && !avatarp->isControlAvatar()) || avatarp->mDrawable.isNull())
 	{
 		return;
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 43d6245a63..8f2cf5bb89 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -343,7 +343,8 @@ void LLPanelObject::getState( )
 
 	// can move or rotate only linked group with move permissions, or sub-object with move and modify perms
 
-    // AXON it's not entirely clear what the motivation is to have 3
+    // AXON REVIEW BEFORE RELEASE, behavior during edit is glitchy.
+    // it's not entirely clear what the motivation is to have 3
     // different rules for enablement. At least the difference between
     // move and rotate looks like just a parens error, have updated accordingly.
 	BOOL enable_move	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 6a71da3918..5c4c430f83 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -361,9 +361,6 @@ void LLPanelVolume::getState( )
     // Animated Mesh
 	BOOL is_animated_mesh = single_root_volume && root_volobjp && root_volobjp->isAnimatedObject();
 	getChild<LLUICtrl>("Animated Mesh Checkbox Ctrl")->setValue(is_animated_mesh);
-    // AXON FIXME CHECK FOR SKIN INFO ALSO
-    // WHAT ABOUT isPermanentEnforced?
-    // What about linksets with some skinned objects?
     BOOL enabled_animated_object_box = FALSE;
     if (root_volobjp && root_volobjp == volobjp)
     {
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index f666f447cb..473d7e5b5f 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -664,9 +664,9 @@ void LLSelectMgr::confirmUnlinkObjects(const LLSD& notification, const LLSD& res
 // the selection and give an error message when the uer has a
 // reasonable expectation for the link to work, but it will fail.
 //
-// AXON - additional check that if the selection includes at least one
-// animated object, the total mesh triangle count cannot exceed the
-// designated limit.
+// For animated objects, there's additional check that if the
+// selection includes at least one animated object, the total mesh
+// triangle count cannot exceed the designated limit.
 bool LLSelectMgr::enableLinkObjects()
 {
 	bool new_value = false;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 0b2931886a..7260d7f928 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5106,7 +5106,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     LLControlAvatar *avatarp = volp->getControlAvatar();
     if (!avatarp)
     {
-        LL_WARNS() << "AXON no control avatar, ignoring" << LL_ENDL;
+        LL_WARNS("Messaging") << "AXON no control avatar, ignoring" << LL_ENDL;
         return;
     }
     
@@ -5120,17 +5120,19 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
-		avatarp->updateVolumeGeom();
-        avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
+        if (!avatarp->mRootVolp->isAnySelected())
+        {
+            avatarp->updateVolumeGeom();
+            avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
+        }
     }
 #else
-    // AXON
+    // AXON REMOVE BEFORE RELEASE?
     // In this block we switch back into static mode when no animations are
     // playing. This is mostly useful for debugging.
     if (num_blocks > 0 && !avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
-        // AXON need to update all objects in the linkset, not just the one where animation is playing
         if (!avatarp->mRootVolp->isAnySelected())
         {
             avatarp->updateVolumeGeom();
@@ -5140,7 +5142,6 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     else if (num_blocks == 0 && avatarp->mPlaying)
     {
         avatarp->mPlaying = false;
-        // AXON need to update all objects in the linkset, not just the one where animation is playing
         if (!avatarp->mRootVolp->isAnySelected())
         {
             avatarp->updateVolumeGeom();
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 3435217fa4..7d370aff35 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3609,7 +3609,7 @@ F32 LLViewerObject::recursiveGetEstTrianglesMax() const
 S32 LLViewerObject::getAnimatedObjectMaxTris() const
 {
     S32 max_tris = 0;
-    // AXON remove after server testing done
+    // AXON REMOVE AFTER SERVER TESTING DONE
     if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits"))
     {
         max_tris = S32_MAX;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index cdbe87de75..ea7214d937 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1108,7 +1108,7 @@ void LLVOAvatar::cleanupClass()
 }
 
 // virtual
-void LLVOAvatar::initInstance(void)
+void LLVOAvatar::initInstance()
 {
 	//-------------------------------------------------------------------------
 	// register motions
@@ -3470,7 +3470,7 @@ void LLVOAvatar::updateDebugText()
                         LLVOVolume *volp = control_av->mRootVolp;
                         if (volp)
                         {
-                            volp->requestInventory(); // AXON should be a no-op if already requested or fetched?
+                            volp->requestInventory(); 
                             LLViewerInventoryItem* item = volp->getInventoryItemByAsset(motionp->getID());
                             if (item)
                             {
@@ -3658,10 +3658,9 @@ void LLVOAvatar::updateFootstepSounds()
 void LLVOAvatar::computeUpdatePeriod()
 {
 	bool visually_muted = isVisuallyMuted();
-    // AXON FIXME this expression is a crawling horror
 	if (mDrawable.notNull()
         && isVisible() 
-        && (!isSelf() || visually_muted) // AXON would the self ever be visually muted?
+        && (!isSelf() || visually_muted)
         && !mIsDummy
         && sUseImpostors
         && !mNeedsAnimUpdate 
@@ -3881,7 +3880,8 @@ void LLVOAvatar::updateTimeStep()
     bool is_pure_dummy = mIsDummy && !isControlAvatar();
 	if (!isSelf() && !is_pure_dummy) // ie, non-self avatars, and animated objects will be affected.
 	{
-        // AXON note that sInstances counts animated objects and standard avatars in the same bucket. Is this desirable?
+        // AXON note that sInstances counts animated objects and
+        // standard avatars in the same bucket. Is this desirable?
 		F32 time_quantum = clamp_rescale((F32)sInstances.size(), 10.f, 35.f, 0.f, 0.25f);
 		F32 pixel_area_scale = clamp_rescale(mPixelArea, 100, 5000, 1.f, 0.f);
 		F32 time_step = time_quantum * pixel_area_scale;
@@ -3999,7 +3999,9 @@ void LLVOAvatar::updateRootPositionAndRotation(LLAgent& agent, F32 speed, bool w
 		//--------------------------------------------------------------------
 		if (!isControlAvatar() && !isAnyAnimationSignaled(AGENT_NO_ROTATE_ANIMS, NUM_AGENT_NO_ROTATE_ANIMS))
 		{
-            // AXON - should we always skip for control avatars? Rotation fixups for avatars in motion, some may be relevant.
+            // AXON - should we always skip for control avatars?
+            // Rotation fixups for avatars in motion, some may be
+            // relevant.
             updateOrientation(agent, speed, delta_time);
 		}
 	}
@@ -5999,7 +6001,6 @@ void LLVOAvatar::showAttachmentOverrides(bool verbose) const
 //-----------------------------------------------------------------------------
 // removeAttachmentOverridesForObject
 //-----------------------------------------------------------------------------
-// AXON handle NPC case
 void LLVOAvatar::removeAttachmentOverridesForObject(LLViewerObject *vo)
 {
     if (vo->getAvatar() != this && vo->getAvatarAncestor() != this)
@@ -6028,7 +6029,6 @@ void LLVOAvatar::removeAttachmentOverridesForObject(LLViewerObject *vo)
 //-----------------------------------------------------------------------------
 // removeAttachmentOverridesForObject
 //-----------------------------------------------------------------------------
-// AXON handle NPC case
 void LLVOAvatar::removeAttachmentOverridesForObject(const LLUUID& mesh_id)
 {	
 	//Subsequent joints are relative to pelvis
@@ -6107,7 +6107,7 @@ void LLVOAvatar::getGround(const LLVector3 &in_pos_agent, LLVector3 &out_pos_age
 	LLVector3d z_vec(0.0f, 0.0f, 1.0f);
 	LLVector3d p0_global, p1_global;
 
-    // AXON update for control avs?
+    // AXON UPDATE FOR CONTROL AVS?
 	if (mIsDummy)
 	{
 		outNorm.setVec(z_vec);
@@ -6137,7 +6137,7 @@ F32 LLVOAvatar::getTimeDilation()
 //-----------------------------------------------------------------------------
 F32 LLVOAvatar::getPixelArea() const
 {
-    // AXON update for control avatars
+    // AXON UPDATE FOR CONTROL AVATARS
 	if (mIsDummy)
 	{
 		return 100000.f;
@@ -6675,7 +6675,7 @@ U32 LLVOAvatar::getNumAnimatedObjectAttachments() const
 S32 LLVOAvatar::getMaxAnimatedObjectAttachments() const
 {
     S32 max_attach = 0;
-    // AXON remove after server testing done
+    // AXON REMOVE AFTER SERVER TESTING DONE
     if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits"))
     {
         max_attach = MAX_AGENT_ATTACHMENTS;
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index 337f969f3d..5def0f0c0f 100644
--- a/indra/newview/llvograss.cpp
+++ b/indra/newview/llvograss.cpp
@@ -92,7 +92,6 @@ LLVOGrass::~LLVOGrass()
 
 void LLVOGrass::updateSpecies()
 {
-	// AXON is grass still even supported? This use of state seems odd.
 	mSpecies = getAttachmentState();
 	
 	if (!sSpeciesTable.count(mSpecies))
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 54029f75fd..96f2255265 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -91,7 +91,6 @@ U32 JOINT_COUNT_REQUIRED_FOR_FULLRIG = 1;
 BOOL gAnimateTextures = TRUE;
 //extern BOOL gHideSelectedObjects;
 
-// AXON TEMP
 S32 LLVOVolume::sForceLOD = -1;
 F32 LLVOVolume::sLODFactor = 1.f;
 F32	LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop 
@@ -1234,7 +1233,7 @@ void LLVOVolume::sculpt()
 S32	LLVOVolume::computeLODDetail(F32 distance, F32 radius)
 {
 	S32	cur_detail;
-    // AXON TEMP
+    // AXON TEMP REMOVE
     if (LLVOVolume::sForceLOD>=0 && LLVOVolume::sForceLOD<=3)
     {
         cur_detail = LLVOVolume::sForceLOD;
@@ -3341,8 +3340,6 @@ BOOL LLVOVolume::isRiggedMesh() const
 }
 
 //----------------------------------------------------------------------------
-// AXON - methods related to extended mesh flags
-
 U32 LLVOVolume::getExtendedMeshFlags() const
 {
 	const LLExtendedMeshParams *param_block = 
@@ -3412,7 +3409,6 @@ bool LLVOVolume::canBeAnimatedObject() const
     F32 est_tris = recursiveGetEstTrianglesMax();
     if (est_tris < 0 || est_tris > getAnimatedObjectMaxTris())
     {
-        LL_DEBUGS("AXON") << "est_tris " << est_tris << " is outside limit of 0-" << getAnimatedObjectMaxTris() << LL_ENDL;
         return false;
     }
     return true;
@@ -3441,6 +3437,8 @@ bool LLVOVolume::isAnimatedObject() const
 // Only the root of a linkset can have the animated object flag set
 // Only the root of a linkset can have a control avatar (iff the animated object flag is set)
 // Only skinned mesh volumes can have the animated object flag set, or a control avatar
+//
+// AXON REVIEW BASED ON FINAL RULES
 bool LLVOVolume::isAnimatedObjectStateConsistent() const
 {
     if (!canBeAnimatedObject())
@@ -3486,16 +3484,9 @@ void LLVOVolume::updateAnimatedObjectStateOnReparent(LLViewerObject *old_parent,
 
     // AXON - depending on whether animated objects can be attached,
     // we may want to include or remove the isAvatar() check.
+    // BUG??
     if (new_parent && !new_parent->isAvatar())
     {
-#if 0 // AXON - MAINT-7819
-        // Object should inherit control avatar and animated mesh flag
-        // from parent, so clear them out from our own state
-        if (getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG)
-        {
-            setExtendedMeshFlags(getExtendedMeshFlags() & ~LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG);
-        }
-#endif
         if (mControlAvatar.notNull())
         {
             LLControlAvatar *av = mControlAvatar;
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index f12eb168f6..afeb1c852b 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -281,9 +281,6 @@ public:
     bool isAnimatedObjectStateConsistent() const;
     void updateAnimatedObjectStateOnReparent(LLViewerObject *old_parent, LLViewerObject *new_parent);
 
-    // AXON For animated objects, we need to track animations requested
-    // per-object, then reconcile those to manage the control avatar
-    // animation state.
 	std::map<LLUUID, S32> 					mObjectSignaledAnimations; // requested state of Animation name/value
 
     // Functions that deal with media, or media navigation
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 436c0cbf43..bab81f4294 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3352,7 +3352,6 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f
 	{
 #if 1
         // AXON debugging
-        
         LLVOVolume *vol_obj = drawablep->getVOVolume();
         if (vol_obj && vol_obj->isAnimatedObject() && vol_obj->isRiggedMesh())
         {
-- 
cgit v1.3


From 64e5cfc05452993bf15a31d9d4a0deeb1414edf0 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 16 Nov 2017 20:00:38 +0000
Subject: SL-704 - more cleanup, including releaseMeshData() for control
 avatars, which don't need mesh data.

---
 indra/newview/llcontrolavatar.cpp |  3 ++-
 indra/newview/llselectmgr.cpp     | 14 ++------------
 indra/newview/llselectmgr.h       |  1 -
 indra/newview/llviewermessage.cpp |  3 +--
 indra/newview/llviewerobject.cpp  |  3 +--
 indra/newview/llvoavatar.cpp      | 12 ++++++------
 6 files changed, 12 insertions(+), 24 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index afa6be188d..7600bc6959 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -52,7 +52,8 @@ LLControlAvatar::~LLControlAvatar()
 // virtual
 void LLControlAvatar::initInstance()
 {
-	// AXON - potential optimizations here - avoid creating system avatar mesh since it's not used.
+	// AXON - potential optimizations here - avoid creating system
+	// avatar mesh since it's not used.
     LLVOAvatar::initInstance();
 }
 
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 473d7e5b5f..2e489fbc09 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -691,7 +691,7 @@ bool LLSelectMgr::enableLinkObjects()
 			new_value = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
 		}
 	}
-    if (!LLSelectMgr::getInstance()->getSelection()->checkAnimatedObjectEstTris())
+    if (!LLSelectMgr::getInstance()->getSelection()->checkAnimatedObjectLinkable())
     {
         new_value = false;
     }
@@ -7451,17 +7451,7 @@ bool LLObjectSelection::checkAnimatedObjectEstTris()
 
 bool LLObjectSelection::checkAnimatedObjectLinkable()
 {
-    LL_ERRS() << "Not using this restriction" << LL_ENDL;
-    // Can't link if any of the roots is currently an animated object
-	for (root_iterator iter = root_begin(); iter != root_end(); ++iter)
-	{
-        LLViewerObject* objectp = (*iter)->getObject();
-        if (objectp && objectp->isAnimatedObject())
-        {
-            return false;
-        }
-	}
-	return true;
+    return checkAnimatedObjectEstTris();
 }
 
 bool LLObjectSelection::applyToRootObjects(LLSelectedObjectFunctor* func, bool firstonly)
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index fcbfd5fccd..eaeeba576c 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -339,7 +339,6 @@ public:
 	// returns TRUE is any node is currenly worn as an attachment
 	BOOL isAttachment();
 
-    // AXON validate a potential link against limits
     bool checkAnimatedObjectEstTris();
     bool checkAnimatedObjectLinkable();
     
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 7260d7f928..ae9798b5d5 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5126,8 +5126,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
             avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
         }
     }
-#else
-    // AXON REMOVE BEFORE RELEASE?
+#else// AXON REMOVE BEFORE RELEASE?
     // In this block we switch back into static mode when no animations are
     // playing. This is mostly useful for debugging.
     if (num_blocks > 0 && !avatarp->mPlaying)
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 7d370aff35..6fff3b0afd 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3609,8 +3609,7 @@ F32 LLViewerObject::recursiveGetEstTrianglesMax() const
 S32 LLViewerObject::getAnimatedObjectMaxTris() const
 {
     S32 max_tris = 0;
-    // AXON REMOVE AFTER SERVER TESTING DONE
-    if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits"))
+    if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits")) // AXON REMOVE AFTER SERVER TESTING DONE
     {
         max_tris = S32_MAX;
     }
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index ea7214d937..b1ae7f543a 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1976,9 +1976,8 @@ void LLVOAvatar::resetSkeleton(bool reset_animations)
 //-----------------------------------------------------------------------------
 void LLVOAvatar::releaseMeshData()
 {
-    // AXON what should we be doing here for control avs? Why are
-    // dummies treated differently in the first place?
-	if (sInstances.size() < AVATAR_RELEASE_THRESHOLD || mIsDummy)
+	if (sInstances.size() < AVATAR_RELEASE_THRESHOLD ||
+        (mIsDummy && !isControlAvatar()))
 	{
 		return;
 	}
@@ -2781,8 +2780,8 @@ void LLVOAvatar::idleUpdateLoadingEffect()
 																 LLPartData::LL_PART_EMISSIVE_MASK | // LLPartData::LL_PART_FOLLOW_SRC_MASK |
 																 LLPartData::LL_PART_TARGET_POS_MASK );
 			
-            // AXON skip cloud effects for dummy avs as well
-			if (!mIsDummy && !isTooComplex()) // do not generate particles for overly-complex avatars
+			// do not generate particles for dummy or overly-complex avatars
+			if (!mIsDummy && !isTooComplex())
 			{
 				setParticleSource(particle_parameters, getID());
 			}
@@ -4393,7 +4392,8 @@ void LLVOAvatar::updateVisibility()
 	}
 	else
 	{
-		if (mMeshValid && mMeshInvisibleTime.getElapsedTimeF32() > TIME_BEFORE_MESH_CLEANUP)
+		if (mMeshValid &&
+            (isControlAvatar() || mMeshInvisibleTime.getElapsedTimeF32() > TIME_BEFORE_MESH_CLEANUP))
 		{
 			releaseMeshData();
 		}
-- 
cgit v1.3


From 0d2d6b42baa4fc6d253c5499324ffe5572676d87 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 1 Dec 2017 14:15:34 +0000
Subject: SL-704, SL-759 - support for impostoring of animated objects, comment
 and code cleanup

---
 indra/newview/app_settings/logcontrol.xml |  2 +-
 indra/newview/llcontrolavatar.cpp         |  9 ++---
 indra/newview/llpanelobject.cpp           | 11 ++++--
 indra/newview/llviewermessage.cpp         | 14 ++++----
 indra/newview/llvoavatar.cpp              | 17 +++++++---
 indra/newview/llvovolume.cpp              | 56 ++++++++++++++-----------------
 indra/newview/pipeline.cpp                |  4 +--
 7 files changed, 62 insertions(+), 51 deletions(-)

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

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 5329b76390..ae57e125bb 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -51,7 +51,7 @@
 					<key>tags</key>
 						<array>
 						<!-- sample entry for debugging specific items	
-                             <string>AXON</string>
+                             <string>AnimatedObjects</string>
 						     <string>Avatar</string>
 						     <string>Inventory</string>
 						     <string>SceneLoadTiming</string>
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 7e89a97c03..920b0fa151 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -52,7 +52,7 @@ LLControlAvatar::~LLControlAvatar()
 // virtual
 void LLControlAvatar::initInstance()
 {
-	// AXON - potential optimizations here: avoid creating system
+	// Potential optimizations here: avoid creating system
 	// avatar mesh content since it's not used. For now we just clean some
 	// things up after the fact in releaseMeshData().
     LLVOAvatar::initInstance();
@@ -280,10 +280,11 @@ void LLControlAvatar::updateDebugText()
                 type_string += "-";
             }
         }
-        addDebugText(llformat("CAV obj %d anim %d active %s",
-                              total_linkset_count, animated_volume_count, active_string.c_str()));
+        addDebugText(llformat("CAV obj %d anim %d active %s impost %d",
+                              total_linkset_count, animated_volume_count, active_string.c_str(), (S32) isImpostor()));
         addDebugText(llformat("types %s lods %s", type_string.c_str(), lod_string.c_str()));
         addDebugText(llformat("tris %d verts %d", total_tris, total_verts));
+        addDebugText(llformat("pxarea %s", LLStringOps::getReadableNumber(getPixelArea()).c_str()));
         std::string region_name = "no region";
         if (mRootVolp->getRegion())
         {
@@ -335,7 +336,7 @@ void LLControlAvatar::updateAnimations()
 {
     if (!mRootVolp)
     {
-        LL_WARNS_ONCE("AXON") << "No root vol" << LL_ENDL;
+        LL_WARNS_ONCE("AnimatedObjects") << "No root vol" << LL_ENDL;
         return;
     }
 
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 8f2cf5bb89..cd00a6f98f 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -347,9 +347,14 @@ void LLPanelObject::getState( )
     // it's not entirely clear what the motivation is to have 3
     // different rules for enablement. At least the difference between
     // move and rotate looks like just a parens error, have updated accordingly.
-	BOOL enable_move	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
-	BOOL enable_scale	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && objectp->permModify();
-	BOOL enable_rotate	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
+	BOOL enable_move	= objectp->permMove() && !objectp->isPermanentEnforced() &&
+        ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) &&
+        ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
+	BOOL enable_scale	= objectp->permMove() && !objectp->isPermanentEnforced() &&
+        ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && objectp->permModify();
+	BOOL enable_rotate	= objectp->permMove() && !objectp->isPermanentEnforced() &&
+        ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) &&
+        ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
 
 	S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
 	BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 24af491391..bfaad30fc1 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5086,32 +5086,32 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     LLViewerObject *objp = gObjectList.findObject(uuid);
     if (!objp)
     {
-		LL_WARNS("Messaging") << "AXON Received animation state for unknown object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "Received animation state for unknown object" << uuid << LL_ENDL;
         return;
     }
     
 	LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp);
     if (!volp)
     {
-		LL_WARNS("Messaging") << "AXON Received animation state for non-volume object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "Received animation state for non-volume object" << uuid << LL_ENDL;
         return;
     }
 
     if (!volp->isAnimatedObject())
     {
-		LL_WARNS("Messaging") << "AXON Received animation state for non-animated object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "Received animation state for non-animated object" << uuid << LL_ENDL;
         return;
     }
 
     LLControlAvatar *avatarp = volp->getControlAvatar();
     if (!avatarp)
     {
-        LL_WARNS("Messaging") << "AXON no control avatar, ignoring" << LL_ENDL;
+        LL_WARNS("Messaging") << "Received animation request for object with no control avatar, ignoring" << LL_ENDL;
         return;
     }
     
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
-	LL_DEBUGS("AXON") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL;
+	LL_DEBUGS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL;
 
 #if 1 
     // Here we go into skinned mode once, the first time we get an
@@ -5156,8 +5156,8 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
         volp->mObjectSignaledAnimations[animation_id] = anim_sequence_id;
-        LL_DEBUGS("AXON") << "got object animation request for object " 
-                          << uuid << " animation id " << animation_id << LL_ENDL;
+        LL_DEBUGS("AnimatedObjects") << "got object animation request for object " 
+                                     << uuid << " animation id " << animation_id << LL_ENDL;
     }
 
     avatarp->updateAnimations();
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index bc5cca4a65..a91e9ff53d 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3461,6 +3461,10 @@ void LLVOAvatar::updateDebugText()
         LLVector3 pelvis_pos = mPelvisp->getPosition();
         debug_line += llformat(" rp %.3f pp %.3f", root_pos[2], pelvis_pos[2]);
 
+        S32 is_visible = (S32) isVisible();
+        S32 is_m_visible = (S32) mVisible;
+        debug_line += llformat(" v %d/%d", is_visible, is_m_visible);
+
 		addDebugText(debug_line);
 	}
 
@@ -3681,7 +3685,7 @@ void LLVOAvatar::computeUpdatePeriod()
 	if (mDrawable.notNull()
         && isVisible() 
         && (!isSelf() || visually_muted)
-        && !mIsDummy
+        && (!mIsDummy || isControlAvatar())
         && sUseImpostors
         && !mNeedsAnimUpdate 
         && !sFreezeCounter)
@@ -3900,7 +3904,7 @@ void LLVOAvatar::updateTimeStep()
     bool is_pure_dummy = mIsDummy && !isControlAvatar();
 	if (!isSelf() && !is_pure_dummy) // ie, non-self avatars, and animated objects will be affected.
 	{
-        // AXON note that sInstances counts animated objects and
+        // Note that sInstances counts animated objects and
         // standard avatars in the same bucket. Is this desirable?
 		F32 time_quantum = clamp_rescale((F32)sInstances.size(), 10.f, 35.f, 0.f, 0.25f);
 		F32 pixel_area_scale = clamp_rescale(mPixelArea, 100, 5000, 1.f, 0.f);
@@ -6162,7 +6166,7 @@ F32 LLVOAvatar::getTimeDilation()
 F32 LLVOAvatar::getPixelArea() const
 {
     // AXON UPDATE FOR CONTROL AVATARS
-	if (mIsDummy)
+	if (mIsDummy && !isControlAvatar())
 	{
 		return 100000.f;
 	}
@@ -7138,9 +7142,14 @@ void LLVOAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color)
 	updateMeshTextures();
 }
 
+// FIXME: We have an mVisible member, set in updateVisibility(), but this
+// function doesn't return it! isVisible() and mVisible are used
+// different places for different purposes. mVisible seems to be more
+// related to whether the actual avatar mesh is shown, and isVisible()
+// to whether anything about the avatar is displayed in the scene.
+// Maybe better naming could make this clearer?
 BOOL LLVOAvatar::isVisible() const
 {
-    // AXON should we flag control avs as invisible?
 	return mDrawable.notNull()
 		&& (!mOrphaned || isSelf())
 		&& (mDrawable->isVisible() || mIsDummy);
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index fbbf0634ff..8c722bf106 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1354,7 +1354,7 @@ BOOL LLVOVolume::updateLOD()
         {
             std::string vobj_name = llformat("Vol%u", (U32) this);
             F32 est_tris = getEstTrianglesMax();
-            LL_DEBUGS("AXONLinkset") << vobj_name << " updateLOD to " << getLOD() << ", tris " << est_tris << LL_ENDL; 
+            LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " updateLOD to " << getLOD() << ", tris " << est_tris << LL_ENDL; 
         }
 #endif
 		gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, FALSE);
@@ -3396,10 +3396,10 @@ void LLVOVolume::setExtendedMeshFlags(U32 flags)
             param_block->setFlags(flags);
         }
         parameterChanged(LLNetworkData::PARAMS_EXTENDED_MESH, true);
-        LL_DEBUGS("AXON") << (U32) this
-                   << " new flags " << flags << " curr_flags " << curr_flags
-                   << ", calling onSetExtendedMeshFlags()"
-                   << LL_ENDL;
+        LL_DEBUGS("AnimatedObjects") << (U32) this
+                                     << " new flags " << flags << " curr_flags " << curr_flags
+                                     << ", calling onSetExtendedMeshFlags()"
+                                     << LL_ENDL;
         onSetExtendedMeshFlags(flags);
     }
 }
@@ -3440,13 +3440,12 @@ void LLVOVolume::updateAnimatedObjectStateOnReparent(LLViewerObject *old_parent,
 {
     LLVOVolume *old_volp = dynamic_cast<LLVOVolume*>(old_parent);
 
-    // AXON - depending on whether animated objects can be attached,
-    // we may want to include or remove the isAvatar() check.
-    // BUG??
     if (new_parent && !new_parent->isAvatar())
     {
         if (mControlAvatar.notNull())
         {
+            // Here an animated object is being made the child of some
+            // other prim. Should remove the control av from the child.
             LLControlAvatar *av = mControlAvatar;
             mControlAvatar = NULL;
             av->markForDeath();
@@ -3925,17 +3924,14 @@ void LLVOVolume::parameterChanged(U16 param_type, LLNetworkData* data, BOOL in_u
     {
         U32 extended_mesh_flags = getExtendedMeshFlags();
         bool enabled =  (extended_mesh_flags & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG);
-        // AXON This is kind of a guess. Better if we could compare
-        // the before and after flags directly. What about cases where
-        // there's no control avatar for optimization reasons?
         bool was_enabled = (getControlAvatar() != NULL);
         if (enabled != was_enabled)
         {
-            LL_DEBUGS("AXON") << (U32) this
-                              << " calling onSetExtendedMeshFlags, enabled " << (U32) enabled
-                              << " was_enabled " << (U32) was_enabled
-                              << " local_origin " << (U32) local_origin
-                              << LL_ENDL;
+            LL_DEBUGS("AnimatedObjects") << (U32) this
+                                         << " calling onSetExtendedMeshFlags, enabled " << (U32) enabled
+                                         << " was_enabled " << (U32) was_enabled
+                                         << " local_origin " << (U32) local_origin
+                                         << LL_ENDL;
             onSetExtendedMeshFlags(extended_mesh_flags);
         }
     }
@@ -4080,7 +4076,7 @@ void LLVOVolume::markForUpdate(BOOL priority)
     {
         std::string vobj_name = llformat("Vol%u", (U32) this);
         F32 est_tris = getEstTrianglesMax();
-        LL_DEBUGS("AXONLinkset") << vobj_name << " markForUpdate, tris " << est_tris << LL_ENDL; 
+        LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " markForUpdate, tris " << est_tris << LL_ENDL; 
     }
 #endif
     LLViewerObject::markForUpdate(priority); 
@@ -5028,15 +5024,15 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
             F32 est_tris = vobj->getEstTrianglesMax();
 
 #if 1
-            LL_DEBUGS("AXONLinkset") << vobj_name << " rebuilding, isAttachment: " << (U32) vobj->isAttachment()
-                              << " is_mesh " << is_mesh
-                              << " est_tris " << est_tris
-                              << " is_animated " << vobj->isAnimatedObject()
-                              << " can_animate " << vobj->canBeAnimatedObject() 
-                              << " cav " << vobj->getControlAvatar() 
-                              << " playing " << (U32) (vobj->getControlAvatar() ? vobj->getControlAvatar()->mPlaying : false)
-                              << " frame " << LLFrameTimer::getFrameCount()
-                              << LL_ENDL;
+            LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " rebuilding, isAttachment: " << (U32) vobj->isAttachment()
+                                                << " is_mesh " << is_mesh
+                                                << " est_tris " << est_tris
+                                                << " is_animated " << vobj->isAnimatedObject()
+                                                << " can_animate " << vobj->canBeAnimatedObject() 
+                                                << " cav " << vobj->getControlAvatar() 
+                                                << " playing " << (U32) (vobj->getControlAvatar() ? vobj->getControlAvatar()->mPlaying : false)
+                                                << " frame " << LLFrameTimer::getFrameCount()
+                                                << LL_ENDL;
 #endif
 
 			llassert_always(vobj);
@@ -5059,11 +5055,11 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
                     F32 tri_count = vobj->getRootEdit()->recursiveGetEstTrianglesMax();
                     if (tri_count <= 0.f)
                     {
-                        LL_DEBUGS("AXON") << vobj_name << " not calling linkControlAvatar(), because no tris" << LL_ENDL;
+                        LL_DEBUGS("AnimatedObjects") << vobj_name << " not calling linkControlAvatar(), because no tris" << LL_ENDL;
                     }
                     else
                     {
-                        LL_DEBUGS("AXON") << vobj_name << " calling linkControlAvatar()" << LL_ENDL;
+                        LL_DEBUGS("AnimatedObjects") << vobj_name << " calling linkControlAvatar()" << LL_ENDL;
                         vobj->linkControlAvatar();
                     }
                 }
@@ -5079,7 +5075,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
                 // the checkbox has changed since the last rebuild.
                 if (vobj->getControlAvatar())
                 {
-                    LL_DEBUGS("AXON") << vobj_name << " calling unlinkControlAvatar()" << LL_ENDL;
+                    LL_DEBUGS("AnimatedObjects") << vobj_name << " calling unlinkControlAvatar()" << LL_ENDL;
                     vobj->unlinkControlAvatar();
                 }
             }
@@ -5583,7 +5579,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
                 {
                     std::string vobj_name = llformat("Vol%u", (U32) vobj);
                     F32 est_tris = vobj->getEstTrianglesMax();
-                    LL_DEBUGS("AXONLinkset") << vobj_name << " rebuildMesh, tris " << est_tris << LL_ENDL; 
+                    LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " rebuildMesh, tris " << est_tris << LL_ENDL; 
         }
 #endif
 				vobj->preRebuild();
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 900c749ee0..6be5db8246 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3357,8 +3357,8 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f
         {
             std::string vobj_name = llformat("Vol%u", (U32) vol_obj);
             F32 est_tris = vol_obj->getEstTrianglesMax();
-            LL_DEBUGS("AXONLinkset") << vobj_name << " markRebuild, tris " << est_tris 
-                                     << " priority " << (S32) priority << " flag " << std::hex << flag << LL_ENDL; 
+            LL_DEBUGS("AnimatedObjectsLinkset") << vobj_name << " markRebuild, tris " << est_tris 
+                                                << " priority " << (S32) priority << " flag " << std::hex << flag << LL_ENDL; 
         }
 #endif
     
-- 
cgit v1.3


From 095dd1b800d82a0fc97177a6fb668ddc72943613 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 21 Dec 2017 20:03:56 +0000
Subject: SL-859 - create control avatar if needed when animation request
 received

---
 indra/newview/llviewermessage.cpp |  1 +
 indra/newview/llviewerobject.cpp  | 28 ++++++++++++++++++++++++++++
 indra/newview/llviewerobject.h    |  2 ++
 indra/newview/llvovolume.cpp      | 35 +++++------------------------------
 4 files changed, 36 insertions(+), 30 deletions(-)

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index bfaad30fc1..46dcf06ebd 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5103,6 +5103,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         return;
     }
 
+    volp->updateControlAvatar();
     LLControlAvatar *avatarp = volp->getControlAvatar();
     if (!avatarp)
     {
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 915b4348b4..fdfc54b67e 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2947,6 +2947,34 @@ LLControlAvatar *LLViewerObject::getControlAvatar() const
     return getRootEdit()->mControlAvatar.get();
 }
 
+void LLViewerObject::updateControlAvatar()
+{
+    LLViewerObject *root = getRootEdit();
+    if (root->isAnimatedObject() && !root->getControlAvatar())
+    {
+        bool any_mesh = root->isMesh();
+        LLViewerObject::const_child_list_t& child_list = root->getChildren();
+        for (LLViewerObject::const_child_list_t::const_iterator iter = child_list.begin();
+             iter != child_list.end(); ++iter)
+        {
+            const LLViewerObject* child = *iter;
+            any_mesh = any_mesh || child->isMesh();
+        }
+        if (any_mesh)
+        {
+            std::string vobj_name = llformat("Vol%u", (U32) root);
+            LL_DEBUGS("AnimatedObjects") << vobj_name << " calling linkControlAvatar()" << LL_ENDL;
+            root->linkControlAvatar();
+        }
+    }
+    if (!root->isAnimatedObject() && root->getControlAvatar())
+    {
+        std::string vobj_name = llformat("Vol%u", (U32) root);
+        LL_DEBUGS("AnimatedObjects") << vobj_name << " calling unlinkControlAvatar()" << LL_ENDL;
+        root->unlinkControlAvatar();
+    }
+}
+
 void LLViewerObject::linkControlAvatar()
 {
     if (!getControlAvatar() && isRootEdit())
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 4a2ccd4e3a..237529f213 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -703,6 +703,8 @@ public:
     void linkControlAvatar();
     // Remove any reference to control av for this prim
     void unlinkControlAvatar();
+    // Link or unlink as needed
+    void updateControlAvatar();
 
     virtual bool isAnimatedObject() const;
 
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ad72fa9480..1725ae4c8a 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5046,38 +5046,13 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 			rigged = rigged || (vobj->isAnimatedObject() && vobj->isRiggedMesh() &&
                 vobj->getControlAvatar() && vobj->getControlAvatar()->mPlaying);
 
-            if (vobj->isAnimatedObject())
+            vobj->updateControlAvatar();
+            if (vobj->getControlAvatar())
             {
-                if (!vobj->getControlAvatar())
-                {
-                    F32 tri_count = vobj->getRootEdit()->recursiveGetEstTrianglesMax();
-                    if (tri_count <= 0.f)
-                    {
-                        LL_DEBUGS("AnimatedObjects") << vobj_name << " not calling linkControlAvatar(), because no tris" << LL_ENDL;
-                    }
-                    else
-                    {
-                        LL_DEBUGS("AnimatedObjects") << vobj_name << " calling linkControlAvatar()" << LL_ENDL;
-                        vobj->linkControlAvatar();
-                    }
-                }
-                if (vobj->getControlAvatar())
-                {
-                    rigged_av = vobj->getControlAvatar();
-                    rigged_av->rebuildAttachmentOverrides();
-                }
+                rigged_av = vobj->getControlAvatar();
+                rigged_av->rebuildAttachmentOverrides();
             }
-            else
-            {
-                // Not animated but has a control avatar - probably
-                // the checkbox has changed since the last rebuild.
-                if (vobj->getControlAvatar())
-                {
-                    LL_DEBUGS("AnimatedObjects") << vobj_name << " calling unlinkControlAvatar()" << LL_ENDL;
-                    vobj->unlinkControlAvatar();
-                }
-            }
-
+            
 			bool bake_sunlight = LLPipeline::sBakeSunlight && drawablep->isStatic();
 
 			bool any_rigged_face = false;
-- 
cgit v1.3


From e1cf4137938638b3232eb5a59c7544b2ec043b0b Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 4 Jan 2018 15:06:40 +0000
Subject: SL-859 - debug logging

---
 indra/newview/llviewermessage.cpp    | 10 ++++++----
 indra/newview/llviewerobjectlist.cpp |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 46dcf06ebd..31cbaf6ac5 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4997,7 +4997,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	if (!avatarp)
 	{
 		// no agent by this ID...error?
-		LL_WARNS("Messaging") << "Received animation state for unknown avatar" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "Received animation state for unknown avatar " << uuid << LL_ENDL;
 		return;
 	}
 
@@ -5083,23 +5083,25 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	
 	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
+    LL_DEBUGS("AnimatedObjects") << "Received animation state for object " << uuid << LL_ENDL;
+    
     LLViewerObject *objp = gObjectList.findObject(uuid);
     if (!objp)
     {
-		LL_WARNS("Messaging") << "Received animation state for unknown object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "Received animation state for unknown object " << uuid << LL_ENDL;
         return;
     }
     
 	LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp);
     if (!volp)
     {
-		LL_WARNS("Messaging") << "Received animation state for non-volume object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "Received animation state for non-volume object " << uuid << LL_ENDL;
         return;
     }
 
     if (!volp->isAnimatedObject())
     {
-		LL_WARNS("Messaging") << "Received animation state for non-animated object" << uuid << LL_ENDL;
+		LL_WARNS("Messaging") << "Received animation state for non-animated object " << uuid << LL_ENDL;
         return;
     }
 
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 6b7e81cb65..27cab9d575 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -531,6 +531,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 			// LL_INFOS() << "Full Update, obj " << local_id << ", global ID" << fullid << "from " << mesgsys->getSender() << LL_ENDL;
 		}
 		objectp = findObject(fullid);
+        LL_DEBUGS("AnimatedObjects") << "processObjectUpdate for uuid " << fullid << " objectp " << objectp << LL_ENDL;
 
 		if(update_cache)
 		{
@@ -606,6 +607,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 #endif
 
 			objectp = createObject(pcode, regionp, fullid, local_id, gMessageSystem->getSender());
+            LL_DEBUGS("AnimatedObjects") << "creating object " << fullid << " result " << objectp << LL_ENDL;
 			if (!objectp)
 			{
 				LL_INFOS() << "createObject failure for object: " << fullid << LL_ENDL;
@@ -1972,6 +1974,8 @@ LLViewerObject *LLViewerObjectList::createObjectFromCache(const LLPCode pcode, L
 {
 	llassert_always(uuid.notNull());
 
+    LL_DEBUGS("AnimatedObjects") << "createObjectFromCache creating " << uuid << LL_ENDL;
+
 	LLViewerObject *objectp = LLViewerObject::createObject(uuid, pcode, regionp);
 	if (!objectp)
 	{
@@ -2005,6 +2009,7 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe
 	{
 		fullid = uuid;
 	}
+    LL_DEBUGS("AnimatedObjects") << "createObject creating " << fullid << LL_ENDL;
 
 	LLViewerObject *objectp = LLViewerObject::createObject(fullid, pcode, regionp);
 	if (!objectp)
-- 
cgit v1.3


From 26add5700d88338b94ce891892948998b0468131 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 22 Jan 2018 22:08:06 +0000
Subject: MAINT-8159 - animation state management during link/unlink commands

---
 indra/newview/llcontrolavatar.cpp |  11 +-
 indra/newview/llviewermessage.cpp |  36 ----
 indra/newview/llviewerobject.cpp  |  10 ++
 indra/newview/llviewerobject.h    |   2 +
 indra/newview/llvoavatar.cpp      | 350 +++++++++++++++++++++-----------------
 indra/newview/llvoavatar.h        |   2 +
 indra/newview/llvovolume.cpp      |  28 ++-
 indra/newview/llvovolume.h        |   3 +-
 8 files changed, 240 insertions(+), 202 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 7270cad0da..22d8f88420 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -367,8 +367,17 @@ void LLControlAvatar::updateAnimations()
             }
         }
     }
-    mSignaledAnimations = anims;
+    if (!mPlaying && anims.size()>0)
+    {
+        mPlaying = true;
+        if (!mRootVolp->isAnySelected())
+        {
+            updateVolumeGeom();
+            mRootVolp->recursiveMarkForUpdate(TRUE);
+        }
+    }
 
+    mSignaledAnimations = anims;
     processAnimationStateChanges();
 }
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 31eda85828..29fb5dcd53 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5116,42 +5116,6 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
 	LL_DEBUGS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL;
 
-#if 1 
-    // Here we go into skinned mode once, the first time we get an
-    // animation request, and then stay there. This is probably the
-    // normally desired behavior.
-    if (!avatarp->mPlaying)
-    {
-        avatarp->mPlaying = true;
-        if (!avatarp->mRootVolp->isAnySelected())
-        {
-            avatarp->updateVolumeGeom();
-            avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
-        }
-    }
-#else// AXON REMOVE BEFORE RELEASE?
-    // In this block we switch back into static mode when no animations are
-    // playing. This is mostly useful for debugging.
-    if (num_blocks > 0 && !avatarp->mPlaying)
-    {
-        avatarp->mPlaying = true;
-        if (!avatarp->mRootVolp->isAnySelected())
-        {
-            avatarp->updateVolumeGeom();
-            avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
-        }
-    }
-    else if (num_blocks == 0 && avatarp->mPlaying)
-    {
-        avatarp->mPlaying = false;
-        if (!avatarp->mRootVolp->isAnySelected())
-        {
-            avatarp->updateVolumeGeom();
-            avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
-        }
-    }
-#endif
-
 	volp->mObjectSignaledAnimations.clear();
 	
     for( S32 i = 0; i < num_blocks; i++ )
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index ee67f5062e..0d515b28d0 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -879,9 +879,18 @@ void LLViewerObject::addChild(LLViewerObject *childp)
 	if(childp->setParent(this))
 	{
 		mChildList.push_back(childp);
+        childp->afterReparent();
 	}
 }
 
+void LLViewerObject::onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent)
+{
+}
+
+void LLViewerObject::afterReparent()
+{
+}
+
 void LLViewerObject::removeChild(LLViewerObject *childp)
 {
 	for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
@@ -2990,6 +2999,7 @@ void LLViewerObject::linkControlAvatar()
     if (getControlAvatar())
     {
         getControlAvatar()->rebuildAttachmentOverrides();
+        getControlAvatar()->updateAnimations();
     }
     else
     {
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 237529f213..dc99978302 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -259,6 +259,8 @@ public:
 	*/
 
 	virtual BOOL setParent(LLViewerObject* parent);
+    virtual void onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent);
+    virtual void afterReparent();
 	virtual void addChild(LLViewerObject *childp);
 	virtual void removeChild(LLViewerObject *childp);
 	const_child_list_t& getChildren() const { 	return mChildList; }
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0688a57439..54a53898fb 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3400,180 +3400,218 @@ bool LLVOAvatar::isInMuteList()
 	return muted;
 }
 
-void LLVOAvatar::updateDebugText()
+void LLVOAvatar::updateAppearanceMessageDebugText()
 {
-    // Leave mDebugText uncleared here, in case a derived class has added some state first
-
-	if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
-	{
-		S32 central_bake_version = -1;
-		if (getRegion())
-		{
-			central_bake_version = getRegion()->getCentralBakeVersion();
-		}
-		bool all_baked_downloaded = allBakedTexturesCompletelyDownloaded();
-		bool all_local_downloaded = allLocalTexturesCompletelyDownloaded();
-		std::string debug_line = llformat("%s%s - mLocal: %d, mEdit: %d, mUSB: %d, CBV: %d",
-										  isSelf() ? (all_local_downloaded ? "L" : "l") : "-",
-										  all_baked_downloaded ? "B" : "b",
-										  mUseLocalAppearance, mIsEditingAppearance,
-										  1, central_bake_version);
-		std::string origin_string = bakedTextureOriginInfo();
-		debug_line += " [" + origin_string + "]";
-		S32 curr_cof_version = LLAppearanceMgr::instance().getCOFVersion();
-		S32 last_request_cof_version = mLastUpdateRequestCOFVersion;
-		S32 last_received_cof_version = mLastUpdateReceivedCOFVersion;
-		if (isSelf())
-		{
-			debug_line += llformat(" - cof: %d req: %d rcv:%d",
-								   curr_cof_version, last_request_cof_version, last_received_cof_version);
-			if (gSavedSettings.getBOOL("DebugForceAppearanceRequestFailure"))
-			{
-				debug_line += " FORCING ERRS";
-			}
-		}
-		else
-		{
-			debug_line += llformat(" - cof rcv:%d", last_received_cof_version);
-		}
-		debug_line += llformat(" bsz-z: %.3f", mBodySize[2]);
-        if (mAvatarOffset[2] != 0.0f)
+    S32 central_bake_version = -1;
+    if (getRegion())
+    {
+        central_bake_version = getRegion()->getCentralBakeVersion();
+    }
+    bool all_baked_downloaded = allBakedTexturesCompletelyDownloaded();
+    bool all_local_downloaded = allLocalTexturesCompletelyDownloaded();
+    std::string debug_line = llformat("%s%s - mLocal: %d, mEdit: %d, mUSB: %d, CBV: %d",
+                                      isSelf() ? (all_local_downloaded ? "L" : "l") : "-",
+                                      all_baked_downloaded ? "B" : "b",
+                                      mUseLocalAppearance, mIsEditingAppearance,
+                                      1, central_bake_version);
+    std::string origin_string = bakedTextureOriginInfo();
+    debug_line += " [" + origin_string + "]";
+    S32 curr_cof_version = LLAppearanceMgr::instance().getCOFVersion();
+    S32 last_request_cof_version = mLastUpdateRequestCOFVersion;
+    S32 last_received_cof_version = mLastUpdateReceivedCOFVersion;
+    if (isSelf())
+    {
+        debug_line += llformat(" - cof: %d req: %d rcv:%d",
+                               curr_cof_version, last_request_cof_version, last_received_cof_version);
+        if (gSavedSettings.getBOOL("DebugForceAppearanceRequestFailure"))
         {
-            debug_line += llformat("avofs-z: %.3f", mAvatarOffset[2]);
+            debug_line += " FORCING ERRS";
         }
-		bool hover_enabled = getRegion() && getRegion()->avatarHoverHeightEnabled();
-		debug_line += hover_enabled ? " H" : " h";
-		const LLVector3& hover_offset = getHoverOffset();
-		if (hover_offset[2] != 0.0)
-		{
-			debug_line += llformat(" hov_z: %.3f", hover_offset[2]);
-			debug_line += llformat(" %s", (isSitting() ? "S" : "T"));
-			debug_line += llformat("%s", (isMotionActive(ANIM_AGENT_SIT_GROUND_CONSTRAINED) ? "G" : "-"));
-		}
-        LLVector3 ankle_right_pos_agent = mFootRightp->getWorldPosition();
-		LLVector3 normal;
-        LLVector3 ankle_right_ground_agent = ankle_right_pos_agent;
-        resolveHeightAgent(ankle_right_pos_agent, ankle_right_ground_agent, normal);
-        F32 rightElev = llmax(-0.2f, ankle_right_pos_agent.mV[VZ] - ankle_right_ground_agent.mV[VZ]);
-        debug_line += llformat(" relev %.3f", rightElev);
+    }
+    else
+    {
+        debug_line += llformat(" - cof rcv:%d", last_received_cof_version);
+    }
+    debug_line += llformat(" bsz-z: %.3f", mBodySize[2]);
+    if (mAvatarOffset[2] != 0.0f)
+    {
+        debug_line += llformat("avofs-z: %.3f", mAvatarOffset[2]);
+    }
+    bool hover_enabled = getRegion() && getRegion()->avatarHoverHeightEnabled();
+    debug_line += hover_enabled ? " H" : " h";
+    const LLVector3& hover_offset = getHoverOffset();
+    if (hover_offset[2] != 0.0)
+    {
+        debug_line += llformat(" hov_z: %.3f", hover_offset[2]);
+        debug_line += llformat(" %s", (isSitting() ? "S" : "T"));
+        debug_line += llformat("%s", (isMotionActive(ANIM_AGENT_SIT_GROUND_CONSTRAINED) ? "G" : "-"));
+    }
+    LLVector3 ankle_right_pos_agent = mFootRightp->getWorldPosition();
+    LLVector3 normal;
+    LLVector3 ankle_right_ground_agent = ankle_right_pos_agent;
+    resolveHeightAgent(ankle_right_pos_agent, ankle_right_ground_agent, normal);
+    F32 rightElev = llmax(-0.2f, ankle_right_pos_agent.mV[VZ] - ankle_right_ground_agent.mV[VZ]);
+    debug_line += llformat(" relev %.3f", rightElev);
 
-        LLVector3 root_pos = mRoot->getPosition();
-        LLVector3 pelvis_pos = mPelvisp->getPosition();
-        debug_line += llformat(" rp %.3f pp %.3f", root_pos[2], pelvis_pos[2]);
+    LLVector3 root_pos = mRoot->getPosition();
+    LLVector3 pelvis_pos = mPelvisp->getPosition();
+    debug_line += llformat(" rp %.3f pp %.3f", root_pos[2], pelvis_pos[2]);
 
-        S32 is_visible = (S32) isVisible();
-        S32 is_m_visible = (S32) mVisible;
-        debug_line += llformat(" v %d/%d", is_visible, is_m_visible);
+    S32 is_visible = (S32) isVisible();
+    S32 is_m_visible = (S32) mVisible;
+    debug_line += llformat(" v %d/%d", is_visible, is_m_visible);
 
-		addDebugText(debug_line);
-	}
+    addDebugText(debug_line);
+}
 
-	if (gSavedSettings.getBOOL("DebugAvatarCompositeBaked"))
-	{
-		if (!mBakedTextureDebugText.empty())
-			addDebugText(mBakedTextureDebugText);
-	}
+LLViewerInventoryItem* getObjectInventoryItem(LLViewerObject *vobj, LLUUID asset_id)
+{
+    LLViewerInventoryItem *item = NULL;
 
-    // Develop -> Avatar -> Animation Info
-	if (LLVOAvatar::sShowAnimationDebug)
-	{
-		for (LLMotionController::motion_list_t::iterator iter = mMotionController.getActiveMotions().begin();
-			 iter != mMotionController.getActiveMotions().end(); ++iter)
-		{
-			LLMotion* motionp = *iter;
-			if (motionp->getMinPixelArea() < getPixelArea())
-			{
-				std::string output;
-                std::string motion_name = motionp->getName();
-				if (motion_name.empty())
-				{
-                    if (isControlAvatar())
+    if (vobj)
+    {
+        if (vobj->getInventorySerial()<=0)
+        {
+            vobj->requestInventory(); 
+        }
+        item = vobj->getInventoryItemByAsset(asset_id);
+    }
+    return item;
+}
+
+LLViewerInventoryItem* recursiveGetObjectInventoryItem(LLViewerObject *vobj, LLUUID asset_id)
+{
+    LLViewerInventoryItem *item = getObjectInventoryItem(vobj, asset_id);
+    if (!item)
+    {
+        LLViewerObject::const_child_list_t& children = vobj->getChildren();
+        for (LLViewerObject::const_child_list_t::const_iterator it = children.begin();
+             it != children.end(); ++it)
+        {
+            LLViewerObject *childp = *it;
+            item = getObjectInventoryItem(childp, asset_id);
+            if (item)
+            {
+                break;
+            }
+        }
+    }
+    return item;
+}
+
+void LLVOAvatar::updateAnimationDebugText()
+{
+    for (LLMotionController::motion_list_t::iterator iter = mMotionController.getActiveMotions().begin();
+         iter != mMotionController.getActiveMotions().end(); ++iter)
+    {
+        LLMotion* motionp = *iter;
+        if (motionp->getMinPixelArea() < getPixelArea())
+        {
+            std::string output;
+            std::string motion_name = motionp->getName();
+            if (motion_name.empty())
+            {
+                if (isControlAvatar())
+                {
+                    LLControlAvatar *control_av = dynamic_cast<LLControlAvatar*>(this);
+                    // Try to get name from inventory of associated object
+                    LLVOVolume *volp = control_av->mRootVolp;
+                    LLViewerInventoryItem *item = recursiveGetObjectInventoryItem(volp,motionp->getID());
+                    if (item)
+                    {
+                        motion_name = item->getName();
+                    }
+                }
+            }
+            if (motion_name.empty())
+            {
+                std::string name;
+                if (gAgent.isGodlikeWithoutAdminMenuFakery() || isSelf())
+                {
+                    name = motionp->getID().asString();
+                    LLVOAvatar::AnimSourceIterator anim_it = mAnimationSources.begin();
+                    for (; anim_it != mAnimationSources.end(); ++anim_it)
                     {
-                        LLControlAvatar *control_av = dynamic_cast<LLControlAvatar*>(this);
-                        // Try to get name from inventory of associated object
-                        LLVOVolume *volp = control_av->mRootVolp;
-                        if (volp)
+                        if (anim_it->second == motionp->getID())
                         {
-                            if (volp->getInventorySerial()<=0)
+                            LLViewerObject* object = gObjectList.findObject(anim_it->first);
+                            if (!object)
+                            {
+                                break;
+                            }
+                            if (object->isAvatar())
                             {
-                                volp->requestInventory(); 
+                                if (mMotionController.mIsSelf)
+                                {
+                                    // Searching inventory by asset id is really long
+                                    // so just mark as inventory
+                                    // Also item is likely to be named by LLPreviewAnim
+                                    name += "(inventory)";
+                                }
                             }
-                            LLViewerInventoryItem* item = volp->getInventoryItemByAsset(motionp->getID());
-                            if (item)
+                            else
                             {
-                                motion_name = item->getName();
+                                LLViewerInventoryItem* item = NULL;
+                                if (!object->isInventoryDirty())
+                                {
+                                    item = object->getInventoryItemByAsset(motionp->getID());
+                                }
+                                if (item)
+                                {
+                                    name = item->getName();
+                                }
+                                else if (object->isAttachment())
+                                {
+                                    name += "(" + getAttachmentItemName() + ")";
+                                }
+                                else
+                                {
+                                    // in-world object, name or content unknown
+                                    name += "(in-world)";
+                                }
                             }
+                            break;
                         }
                     }
                 }
-                if (motion_name.empty())
+                else
                 {
-					std::string name;
-					if (gAgent.isGodlikeWithoutAdminMenuFakery() || isSelf())
-					{
-						name = motionp->getID().asString();
-						LLVOAvatar::AnimSourceIterator anim_it = mAnimationSources.begin();
-						for (; anim_it != mAnimationSources.end(); ++anim_it)
-						{
-							if (anim_it->second == motionp->getID())
-							{
-								LLViewerObject* object = gObjectList.findObject(anim_it->first);
-								if (!object)
-								{
-									break;
-								}
-								if (object->isAvatar())
-								{
-									if (mMotionController.mIsSelf)
-									{
-										// Searching inventory by asset id is really long
-										// so just mark as inventory
-										// Also item is likely to be named by LLPreviewAnim
-										name += "(inventory)";
-									}
-								}
-								else
-								{
-									LLViewerInventoryItem* item = NULL;
-									if (!object->isInventoryDirty())
-									{
-										item = object->getInventoryItemByAsset(motionp->getID());
-									}
-									if (item)
-									{
-										name = item->getName();
-									}
-									else if (object->isAttachment())
-									{
-										name += "(" + getAttachmentItemName() + ")";
-									}
-									else
-									{
-										// in-world object, name or content unknown
-										name += "(in-world)";
-									}
-								}
-								break;
-							}
-						}
-					}
-					else
-					{
-						name = LLUUID::null.asString();
-					}
-					output = llformat("%s - %d",
-							  name.c_str(),
-							  (U32)motionp->getPriority());
-				}
-				else
-				{
-					output = llformat("%s - %d",
-                                      motion_name.c_str(),
-                                      (U32)motionp->getPriority());
-				}
-				addDebugText(output);
-			}
-		}
+                    name = LLUUID::null.asString();
+                }
+                output = llformat("%s - %d",
+                                  name.c_str(),
+                                  (U32)motionp->getPriority());
+            }
+            else
+            {
+                output = llformat("%s - %d",
+                                  motion_name.c_str(),
+                                  (U32)motionp->getPriority());
+            }
+            addDebugText(output);
+        }
+    }
+}
+
+void LLVOAvatar::updateDebugText()
+{
+    // Leave mDebugText uncleared here, in case a derived class has added some state first
+
+	if (gSavedSettings.getBOOL("DebugAvatarAppearanceMessage"))
+	{
+        updateAppearanceMessageDebugText();
+	}
+
+	if (gSavedSettings.getBOOL("DebugAvatarCompositeBaked"))
+	{
+		if (!mBakedTextureDebugText.empty())
+			addDebugText(mBakedTextureDebugText);
+	}
+
+    // Develop -> Avatar -> Animation Info
+	if (LLVOAvatar::sShowAnimationDebug)
+	{
+        updateAnimationDebugText();
 	}
 
 	if (!mDebugText.size() && mText.notNull())
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index de8da4f7ca..e9eadb77e9 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -246,6 +246,8 @@ private: //aligned members
 	// Updates
 	//--------------------------------------------------------------------
 public:
+    void			updateAppearanceMessageDebugText();
+	void 			updateAnimationDebugText();
 	virtual void	updateDebugText();
 	virtual BOOL 	updateCharacter(LLAgent &agent);
     void			updateFootstepSounds();
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 7192b4a196..aa50122ff0 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1445,7 +1445,7 @@ BOOL LLVOVolume::setParent(LLViewerObject* parent)
 			gPipeline.markMoved(mDrawable);
 			gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
 		}
-        updateAnimatedObjectStateOnReparent(old_parent, parent);
+        onReparent(old_parent, parent);
 	}
 
 	return ret ;
@@ -3427,8 +3427,10 @@ bool LLVOVolume::isAnimatedObject() const
 
 // Called any time parenting changes for a volume. Update flags and
 // control av accordingly.  This is called after parent has been
-// changed to new_parent.
-void LLVOVolume::updateAnimatedObjectStateOnReparent(LLViewerObject *old_parent, LLViewerObject *new_parent)
+// changed to new_parent, but before new_parent's mChildList has changed.
+
+// virtual
+void LLVOVolume::onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent)
 {
     LLVOVolume *old_volp = dynamic_cast<LLVOVolume*>(old_parent);
 
@@ -3442,11 +3444,6 @@ void LLVOVolume::updateAnimatedObjectStateOnReparent(LLViewerObject *old_parent,
             mControlAvatar = NULL;
             av->markForDeath();
         }
-        // If this succeeds now, it's because the new_parent is an animated object
-        if (isAnimatedObject() && getControlAvatar())
-        {
-            getControlAvatar()->addAttachmentOverridesForObject(this);
-        }
     }
     if (old_volp && old_volp->isAnimatedObject())
     {
@@ -3454,10 +3451,25 @@ void LLVOVolume::updateAnimatedObjectStateOnReparent(LLViewerObject *old_parent,
         {
             // We have been removed from an animated object, need to do cleanup.
             old_volp->getControlAvatar()->rebuildAttachmentOverrides();
+            old_volp->getControlAvatar()->updateAnimations();
         }
     }
 }
 
+// This needs to be called after onReparent(), because mChildList is
+// not updated until the end of LLViewerObject::addChild()
+
+// virtual
+void LLVOVolume::afterReparent()
+{
+    // If this succeeds now, it's because the new parent is an animated object
+    if (isAnimatedObject() && getControlAvatar())
+    {
+        getControlAvatar()->addAttachmentOverridesForObject(this);
+        getControlAvatar()->updateAnimations();
+    }
+}
+
 //----------------------------------------------------------------------------
 
 void LLVOVolume::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point)
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index afd6c234ee..a6ba8014e2 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -278,7 +278,8 @@ public:
     void setExtendedMeshFlags(U32 flags);
     bool canBeAnimatedObject() const;
     bool isAnimatedObject() const;
-    void updateAnimatedObjectStateOnReparent(LLViewerObject *old_parent, LLViewerObject *new_parent);
+    virtual void onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent);
+    virtual void afterReparent();
 
 	std::map<LLUUID, S32> 					mObjectSignaledAnimations; // requested state of Animation name/value
 
-- 
cgit v1.3


From 5af9ce5737903aa730db47733fbb0e164d87eaf4 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 23 Feb 2018 20:30:38 +0000
Subject: MAINT-8264 - possible fix for yet another LOD stuck case

---
 indra/newview/llviewermessage.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 29fb5dcd53..201920ef54 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5116,6 +5116,16 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
 	LL_DEBUGS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL;
 
+    if (!avatarp->mPlaying)
+    {
+        avatarp->mPlaying = true;
+        if (!avatarp->mRootVolp->isAnySelected())
+        {
+            avatarp->updateVolumeGeom();
+            avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
+        }
+    }
+        
 	volp->mObjectSignaledAnimations.clear();
 	
     for( S32 i = 0; i < num_blocks; i++ )
-- 
cgit v1.3


From 0608bce54bc818774a38403e2252e25fb54d7ed6 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 2 May 2018 21:33:46 +0100
Subject: MAINT-8608 - more detailed logging of issues with object animation
 requests.

---
 indra/newview/llviewermessage.cpp | 17 +++++++++--------
 indra/newview/llvovolume.cpp      |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 16d306f997..05494b74f7 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5075,6 +5075,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	}
 }
 
+// AXON make logging less spammy after issues resolved, before release.
 void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 {
 	LLUUID	animation_id;
@@ -5083,25 +5084,25 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	
 	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
-    LL_DEBUGS("AnimatedObjects") << "Received animation state for object " << uuid << LL_ENDL;
+    LL_INFOS("AnimatedObjects") << "Received animation state for object " << uuid << LL_ENDL;
     
     LLViewerObject *objp = gObjectList.findObject(uuid);
     if (!objp)
     {
-		LL_WARNS("Messaging") << "Received animation state for unknown object " << uuid << LL_ENDL;
+		LL_WARNS("AnimatedObjects") << "Received animation state for unknown object " << uuid << LL_ENDL;
         return;
     }
     
 	LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp);
     if (!volp)
     {
-		LL_WARNS("Messaging") << "Received animation state for non-volume object " << uuid << LL_ENDL;
+		LL_WARNS("AnimatedObjects") << "Received animation state for non-volume object " << uuid << LL_ENDL;
         return;
     }
 
     if (!volp->isAnimatedObject())
     {
-		LL_WARNS("Messaging") << "Received animation state for non-animated object " << uuid << LL_ENDL;
+		LL_WARNS("AnimatedObjects") << "Received animation state for non-animated object " << uuid << LL_ENDL;
         return;
     }
 
@@ -5109,12 +5110,12 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     LLControlAvatar *avatarp = volp->getControlAvatar();
     if (!avatarp)
     {
-        LL_WARNS("Messaging") << "Received animation request for object with no control avatar, ignoring" << LL_ENDL;
+        LL_WARNS("AnimatedObjects") << "Received animation request for object with no control avatar, ignoring " << uuid << LL_ENDL;
         return;
     }
     
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
-	LL_DEBUGS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << LL_ENDL;
+	LL_INFOS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << " uuid " << uuid << LL_ENDL;
 
     if (!avatarp->mPlaying)
     {
@@ -5133,8 +5134,8 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
         volp->mObjectSignaledAnimations[animation_id] = anim_sequence_id;
-        LL_DEBUGS("AnimatedObjects") << "got object animation request for object " 
-                                     << uuid << " animation id " << animation_id << LL_ENDL;
+        LL_INFOS("AnimatedObjects") << "added object animation request for object " 
+                                    << uuid << " animation id " << animation_id << LL_ENDL;
     }
 
     avatarp->updateAnimations();
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 91ef64cb4b..e08379af09 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3696,7 +3696,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 		{
             if (isAnimatedObject() && isRiggedMesh())
             {
-                // AXON Scaling here is to make animated object vs
+                // Scaling here is to make animated object vs
                 // non-animated object ARC proportional to the
                 // corresponding calculations for streaming cost.
                 num_triangles = (ANIMATED_OBJECT_COST_PER_KTRI * 0.001 * costs.getEstTrisForStreamingCost())/0.06;
-- 
cgit v1.3


From 7ed17b5c2c11b9e57316c87b29524b88edb8f762 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 3 May 2018 22:42:02 +0100
Subject: MAINT-8608, MAINT-8539, MAINT-8615 - changes to make object animation
 info more persistent, tolerant to race conditions during initialization

---
 indra/newview/llcontrolavatar.cpp |  7 ++++---
 indra/newview/llcontrolavatar.h   | 14 ++++++++++++++
 indra/newview/llviewermessage.cpp | 28 ++++++++++++++--------------
 indra/newview/llviewerobject.cpp  |  1 +
 indra/newview/llvovolume.h        |  2 --
 5 files changed, 33 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index d655f2cd37..f298a8884b 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -367,8 +367,9 @@ void LLControlAvatar::updateAnimations()
     for (std::vector<LLVOVolume*>::iterator vol_it = volumes.begin(); vol_it != volumes.end(); ++vol_it)
     {
         LLVOVolume *volp = *vol_it;
-        for (std::map<LLUUID,S32>::iterator anim_it = volp->mObjectSignaledAnimations.begin();
-             anim_it != volp->mObjectSignaledAnimations.end();
+        signaled_animation_map_t& signaled_animations = LLObjectSignaledAnimationMap::instance().getMap()[volp->getID()];
+        for (std::map<LLUUID,S32>::iterator anim_it = signaled_animations.begin();
+             anim_it != signaled_animations.end();
              ++anim_it)
         {
             std::map<LLUUID,S32>::iterator found_anim_it = anims.find(anim_it->first);
@@ -384,7 +385,7 @@ void LLControlAvatar::updateAnimations()
             }
         }
     }
-    if (!mPlaying && anims.size()>0)
+    if (!mPlaying)
     {
         mPlaying = true;
         if (!mRootVolp->isAnySelected())
diff --git a/indra/newview/llcontrolavatar.h b/indra/newview/llcontrolavatar.h
index f45de25d81..02244769b9 100644
--- a/indra/newview/llcontrolavatar.h
+++ b/indra/newview/llcontrolavatar.h
@@ -82,4 +82,18 @@ public:
 
 };
 
+typedef std::map<LLUUID, S32> signaled_animation_map_t;
+typedef std::map<LLUUID, signaled_animation_map_t> object_signaled_animation_map_t;
+
+// Stores information about previously requested animations, by object id.
+class LLObjectSignaledAnimationMap: public LLSingleton<LLObjectSignaledAnimationMap>
+{
+    LLSINGLETON_EMPTY_CTOR(LLObjectSignaledAnimationMap); 
+
+public:
+    object_signaled_animation_map_t mMap;
+
+    object_signaled_animation_map_t& getMap() { return mMap; }
+};
+
 #endif //LL_CONTROLAVATAR_H
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 05494b74f7..e8db01efed 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5075,6 +5075,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	}
 }
 
+
 // AXON make logging less spammy after issues resolved, before release.
 void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 {
@@ -5085,6 +5086,19 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
     LL_INFOS("AnimatedObjects") << "Received animation state for object " << uuid << LL_ENDL;
+
+    signaled_animation_map_t signaled_anims;
+	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
+	LL_INFOS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << " uuid " << uuid << LL_ENDL;
+    for( S32 i = 0; i < num_blocks; i++ )
+    {
+        mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
+        mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
+        signaled_anims[animation_id] = anim_sequence_id;
+        LL_INFOS("AnimatedObjects") << "added signaled_anims animation request for object " 
+                                    << uuid << " animation id " << animation_id << LL_ENDL;
+    }
+    LLObjectSignaledAnimationMap::instance().getMap()[uuid] = signaled_anims;
     
     LLViewerObject *objp = gObjectList.findObject(uuid);
     if (!objp)
@@ -5114,9 +5128,6 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         return;
     }
     
-	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
-	LL_INFOS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << " uuid " << uuid << LL_ENDL;
-
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
@@ -5127,17 +5138,6 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
         }
     }
         
-	volp->mObjectSignaledAnimations.clear();
-	
-    for( S32 i = 0; i < num_blocks; i++ )
-    {
-        mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
-        mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
-        volp->mObjectSignaledAnimations[animation_id] = anim_sequence_id;
-        LL_INFOS("AnimatedObjects") << "added object animation request for object " 
-                                    << uuid << " animation id " << animation_id << LL_ENDL;
-    }
-
     avatarp->updateAnimations();
 }
 
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 1cd50e3400..166fc04ad0 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3024,6 +3024,7 @@ void LLViewerObject::linkControlAvatar()
                 cav->mRootVolp->recursiveMarkForUpdate(TRUE);
             }
         }
+        cav->updateAnimations();
     }
     else
     {
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 3ffb7c140a..952c94db0e 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -282,8 +282,6 @@ public:
     virtual void onReparent(LLViewerObject *old_parent, LLViewerObject *new_parent);
     virtual void afterReparent();
 
-	std::map<LLUUID, S32> 					mObjectSignaledAnimations; // requested state of Animation name/value
-
     // Functions that deal with media, or media navigation
     
     // Update this object's media data with the given media data array
-- 
cgit v1.3


From 2a48816717087e07eb3f3855798c5dd71f541ee5 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 4 May 2018 21:18:13 +0100
Subject: MAINT-8608, MAINT-8539, MAINT-8615 - more animation state management
 - less log spam, more docs

---
 indra/newview/llcontrolavatar.cpp |  6 +++---
 indra/newview/llviewermessage.cpp | 14 +++++++-------
 indra/newview/llviewerobject.cpp  | 36 ++++++++++++++++++++++++++----------
 3 files changed, 36 insertions(+), 20 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index c977f3784f..5a1add258c 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -355,7 +355,7 @@ void LLControlAvatar::updateAnimations()
 {
     if (!mRootVolp)
     {
-        LL_WARNS_ONCE("AnimatedObjects") << "No root vol" << LL_ENDL;
+        LL_WARNS_ONCE("AnimatedObjectsNotify") << "No root vol" << LL_ENDL;
         return;
     }
 
@@ -367,7 +367,7 @@ void LLControlAvatar::updateAnimations()
     for (std::vector<LLVOVolume*>::iterator vol_it = volumes.begin(); vol_it != volumes.end(); ++vol_it)
     {
         LLVOVolume *volp = *vol_it;
-        LL_INFOS("AnimatedObjects") << "updating anim for vol " << volp->getID() << " root " << mRootVolp->getID() << LL_ENDL;
+        //LL_INFOS("AnimatedObjects") << "updating anim for vol " << volp->getID() << " root " << mRootVolp->getID() << LL_ENDL;
         signaled_animation_map_t& signaled_animations = LLObjectSignaledAnimationMap::instance().getMap()[volp->getID()];
         for (std::map<LLUUID,S32>::iterator anim_it = signaled_animations.begin();
              anim_it != signaled_animations.end();
@@ -384,7 +384,7 @@ void LLControlAvatar::updateAnimations()
                 // Animation not already present, use this sequence id.
                 anims[anim_it->first] = anim_it->second;
             }
-            LL_INFOS("AnimatedObjects") << "found anim for vol " << volp->getID() << " anim " << anim_it->first << " root " << mRootVolp->getID() << LL_ENDL;
+            LL_DEBUGS("AnimatedObjectsNotify") << "found anim for vol " << volp->getID() << " anim " << anim_it->first << " root " << mRootVolp->getID() << LL_ENDL;
         }
     }
     if (!mPlaying)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e8db01efed..ba3e9e6993 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5085,17 +5085,17 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 	
 	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
-    LL_INFOS("AnimatedObjects") << "Received animation state for object " << uuid << LL_ENDL;
+    LL_DEBUGS("AnimatedObjectsNotify") << "Received animation state for object " << uuid << LL_ENDL;
 
     signaled_animation_map_t signaled_anims;
 	S32 num_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationList);
-	LL_INFOS("AnimatedObjects") << "processing object animation requests, num_blocks " << num_blocks << " uuid " << uuid << LL_ENDL;
+	LL_DEBUGS("AnimatedObjectsNotify") << "processing object animation requests, num_blocks " << num_blocks << " uuid " << uuid << LL_ENDL;
     for( S32 i = 0; i < num_blocks; i++ )
     {
         mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
         mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
         signaled_anims[animation_id] = anim_sequence_id;
-        LL_INFOS("AnimatedObjects") << "added signaled_anims animation request for object " 
+        LL_DEBUGS("AnimatedObjectsNotify") << "added signaled_anims animation request for object " 
                                     << uuid << " animation id " << animation_id << LL_ENDL;
     }
     LLObjectSignaledAnimationMap::instance().getMap()[uuid] = signaled_anims;
@@ -5103,20 +5103,20 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     LLViewerObject *objp = gObjectList.findObject(uuid);
     if (!objp)
     {
-		LL_WARNS("AnimatedObjects") << "Received animation state for unknown object " << uuid << LL_ENDL;
+		LL_DEBUGS("AnimatedObjectsNotify") << "Received animation state for unknown object " << uuid << LL_ENDL;
         return;
     }
     
 	LLVOVolume *volp = dynamic_cast<LLVOVolume*>(objp);
     if (!volp)
     {
-		LL_WARNS("AnimatedObjects") << "Received animation state for non-volume object " << uuid << LL_ENDL;
+		LL_DEBUGS("AnimatedObjectsNotify") << "Received animation state for non-volume object " << uuid << LL_ENDL;
         return;
     }
 
     if (!volp->isAnimatedObject())
     {
-		LL_WARNS("AnimatedObjects") << "Received animation state for non-animated object " << uuid << LL_ENDL;
+		LL_DEBUGS("AnimatedObjectsNotify") << "Received animation state for non-animated object " << uuid << LL_ENDL;
         return;
     }
 
@@ -5124,7 +5124,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     LLControlAvatar *avatarp = volp->getControlAvatar();
     if (!avatarp)
     {
-        LL_WARNS("AnimatedObjects") << "Received animation request for object with no control avatar, ignoring " << uuid << LL_ENDL;
+        LL_DEBUGS("AnimatedObjectsNotify") << "Received animation request for object with no control avatar, ignoring " << uuid << LL_ENDL;
         return;
     }
     
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 725f48f091..1f23286dac 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2966,20 +2966,38 @@ LLControlAvatar *LLViewerObject::getControlAvatar() const
     return getRootEdit()->mControlAvatar.get();
 }
 
+// Manage the control avatar state of a given object.
+// Any object can be flagged as animated, but for performance reasons
+// we don't want to incur the overhead of managing a control avatar
+// unless this would have some user-visible consequence. That is,
+// there should be at least one rigged mesh in the linkset. Operations
+// that change the state of a linkset, such as linking or unlinking
+// prims, can also mean that a control avatar needs to be added or
+// removed. At the end, if there is a control avatar, we make sure
+// that its animation state is current.
 void LLViewerObject::updateControlAvatar()
 {
     LLViewerObject *root = getRootEdit();
-    bool any_rigged_mesh = root->isRiggedMesh();
-    LLViewerObject::const_child_list_t& child_list = root->getChildren();
-    for (LLViewerObject::const_child_list_t::const_iterator iter = child_list.begin();
-         iter != child_list.end(); ++iter)
+    bool is_animated_object = root->isAnimatedObject();
+    bool has_control_avatar = getControlAvatar();
+    if (!is_animated_object && !has_control_avatar)
     {
-        const LLViewerObject* child = *iter;
-        any_rigged_mesh = any_rigged_mesh || child->isRiggedMesh();
+        return;
     }
 
-    bool has_control_avatar = getControlAvatar();
-    bool should_have_control_avatar = root->isAnimatedObject() && any_rigged_mesh;
+    bool should_have_control_avatar = false;
+    if (is_animated_object)
+    {
+        bool any_rigged_mesh = root->isRiggedMesh();
+        LLViewerObject::const_child_list_t& child_list = root->getChildren();
+        for (LLViewerObject::const_child_list_t::const_iterator iter = child_list.begin();
+             iter != child_list.end(); ++iter)
+        {
+            const LLViewerObject* child = *iter;
+            any_rigged_mesh = any_rigged_mesh || child->isRiggedMesh();
+        }
+        should_have_control_avatar = is_animated_object && any_rigged_mesh;
+    }
 
     if (should_have_control_avatar && !has_control_avatar)
     {
@@ -3018,7 +3036,6 @@ void LLViewerObject::linkControlAvatar()
     if (cav)
     {
         cav->updateAttachmentOverrides();
-        cav->updateAnimations();
         if (!cav->mPlaying)
         {
             cav->mPlaying = true;
@@ -3028,7 +3045,6 @@ void LLViewerObject::linkControlAvatar()
                 cav->mRootVolp->recursiveMarkForUpdate(TRUE);
             }
         }
-        //cav->updateAnimations();
     }
     else
     {
-- 
cgit v1.3


From 56458152aca5a25663377fc9dde087de78bfb412 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 8 Aug 2018 22:11:32 +0100
Subject: SL-704 - code cleanup, mostly old AXON comments.

---
 indra/llcharacter/lljoint.cpp     | 24 ++----------------------
 indra/newview/llpanelobject.cpp   | 15 ---------------
 indra/newview/llskinningutil.cpp  |  4 ++--
 indra/newview/llviewermessage.cpp |  1 -
 indra/newview/llviewerobject.cpp  |  2 +-
 indra/newview/llvoavatar.cpp      | 21 +++++++--------------
 6 files changed, 12 insertions(+), 55 deletions(-)

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

diff --git a/indra/llcharacter/lljoint.cpp b/indra/llcharacter/lljoint.cpp
index 07fcd99701..e2f512f86e 100644
--- a/indra/llcharacter/lljoint.cpp
+++ b/indra/llcharacter/lljoint.cpp
@@ -428,26 +428,6 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
 	{
 		return;
 	}
-    // BENTO
-    // Not clear pelvis overrides are meaningful/useful.
-    //if (mName == "mPelvis")
-    //{
-    //    return;
-    //}
-
-#if 0 // AXON MAINT-8554 - this may be overly restrictive for large models
-    LLVector3 constrained_pos = LLVector3(llclamp(pos[0],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET),
-                                          llclamp(pos[1],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET),
-                                          llclamp(pos[2],-LL_MAX_PELVIS_OFFSET, LL_MAX_PELVIS_OFFSET));
-    if (constrained_pos != pos)
-    {
-        LL_DEBUGS("Avatar") << mesh_id << " joint " << getName() << " attachment pos override constrained to " 
-                            << constrained_pos << " was " << pos << LL_ENDL;
-    }
-#else
-    LLVector3 constrained_pos = pos;
-#endif
-    
     LLVector3 before_pos;
     LLUUID before_mesh_id;
     bool has_active_override_before = hasAttachmentPosOverride( before_pos, before_mesh_id );
@@ -459,7 +439,7 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
 		}
 		m_posBeforeOverrides = getPosition();
 	}
-	m_attachmentPosOverrides.add(mesh_id,constrained_pos);
+	m_attachmentPosOverrides.add(mesh_id,pos);
     LLVector3 after_pos;
     LLUUID after_mesh_id;
     hasAttachmentPosOverride(after_pos, after_mesh_id);
@@ -468,7 +448,7 @@ void LLJoint::addAttachmentPosOverride( const LLVector3& pos, const LLUUID& mesh
         active_override_changed = true; 
         if (do_debug_joint(getName()))
         {
-            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " addAttachmentPosOverride for mesh " << mesh_id << " pos " << constrained_pos << LL_ENDL;
+            LL_DEBUGS("Avatar") << "av " << av_info << " joint " << getName() << " addAttachmentPosOverride for mesh " << mesh_id << " pos " << pos << LL_ENDL;
         }
         updatePos(av_info);
     }
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index ed7017bd5c..25cfb598e7 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -342,24 +342,9 @@ void LLPanelObject::getState( )
 	}
 
 	// can move or rotate only linked group with move permissions, or sub-object with move and modify perms
-#if 0
-    // AXON REVIEW BEFORE RELEASE, behavior during edit is glitchy.
-    // it's not entirely clear what the motivation is to have 3
-    // different rules for enablement. At least the difference between
-    // move and rotate looks like just a parens error, have updated accordingly.
-	BOOL enable_move	= objectp->permMove() && !objectp->isPermanentEnforced() &&
-        ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) &&
-        ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
-	BOOL enable_scale	= objectp->permMove() && !objectp->isPermanentEnforced() &&
-        ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && objectp->permModify();
-	BOOL enable_rotate	= objectp->permMove() && !objectp->isPermanentEnforced() &&
-        ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) &&
-        ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
-#else
 	BOOL enable_move	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
 	BOOL enable_scale	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && objectp->permModify();
 	BOOL enable_rotate	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
-#endif
 
 	S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
 	BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))
diff --git a/indra/newview/llskinningutil.cpp b/indra/newview/llskinningutil.cpp
index 3d6b0ed957..0fa4c2b114 100644
--- a/indra/newview/llskinningutil.cpp
+++ b/indra/newview/llskinningutil.cpp
@@ -317,7 +317,7 @@ void LLSkinningUtil::updateRiggingInfo(const LLMeshSkinInfo* skin, LLVOAvatar *a
                     LLVector4 wght;
                     S32 idx[4];
                     F32 scale = 0.0f;
-                    // AXON unpacking of weights should be pulled into a common function and optimized if possible.
+                    // FIXME unpacking of weights should be pulled into a common function and optimized if possible.
                     for (U32 k = 0; k < 4; k++)
                     {
                         F32 w = weights[k];
@@ -342,7 +342,7 @@ void LLSkinningUtil::updateRiggingInfo(const LLMeshSkinInfo* skin, LLVOAvatar *a
                             {
                                 rig_info_tab[joint_num].setIsRiggedTo(true);
 
-                                // AXON can precompute these matMuls.
+                                // FIXME could precompute these matMuls.
                                 LLMatrix4a bind_shape;
                                 bind_shape.loadu(skin->mBindShapeMatrix);
                                 LLMatrix4a inv_bind;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 413596a514..dc11bc28e5 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3995,7 +3995,6 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 }
 
 
-// AXON make logging less spammy after issues resolved, before release.
 void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
 {
 	LLUUID	animation_id;
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index a731a39bd6..f963f8a0c8 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3720,7 +3720,7 @@ F32 LLViewerObject::recursiveGetEstTrianglesMax() const
 S32 LLViewerObject::getAnimatedObjectMaxTris() const
 {
     S32 max_tris = 0;
-    if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits")) // AXON REMOVE AFTER SERVER TESTING DONE
+    if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits")) 
     {
         max_tris = S32_MAX;
     }
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 127dfe7c60..dba99c7e98 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1300,7 +1300,7 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
 
     S32 box_detail = gSavedSettings.getS32("AvatarBoundingBoxComplexity");
 
-    // AXON the update_min_max function used below assumes there is a
+    // FIXME the update_min_max function used below assumes there is a
     // known starting point, but in general there isn't. Ideally the
     // box update logic should be modified to handle the no-point-yet
     // case. For most models, starting with the pelvis is safe though.
@@ -1361,7 +1361,7 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
                      attachment_iter != attachment->mAttachedObjects.end();
                      ++attachment_iter)
                 {
-                    // AXON Don't we need to look at children of attached_object as well?
+                    // Don't we need to look at children of attached_object as well?
                     const LLViewerObject* attached_object = (*attachment_iter);
                     if (attached_object && !attached_object->isHUDAttachment())
                     {
@@ -1418,8 +1418,8 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
     // Stretch bounding box by rigged mesh joint boxes
     if (box_detail>=3)
     {
-        // AXON try to cache unless something has changed about attached rigged meshes.
-        // Needs more logic based on volume states.
+        // FIXME could try to cache unless something has changed about attached rigged meshes, 
+        // but needs more logic based on volume states.
 
         //if (mRiggingInfoTab.needsUpdate())
         {
@@ -5962,13 +5962,6 @@ void LLVOAvatar::rebuildAttachmentOverrides()
 // -----------------------------------------------------------------------------
 void LLVOAvatar::updateAttachmentOverrides()
 {
-    const bool paranoid_checking = false; 	// AXON remove when testing done
-
-    if (paranoid_checking)
-    {
-        //dumpArchetypeXML(getFullname() + "_paranoid_before");
-    }
-
     LLScopedContextString str("updateAttachmentOverrides " + getFullname());
 
     LL_DEBUGS("AnimatedObjects") << "updating" << LL_ENDL;
@@ -6023,7 +6016,7 @@ void LLVOAvatar::updateAttachmentOverrides()
     }
 
 
-    if (paranoid_checking)
+#ifdef ATTACHMENT_OVERRIDE_VALIDATION
     {
         std::vector<LLVector3OverrideMap> pos_overrides_by_joint;
         std::vector<LLVector3OverrideMap> scale_overrides_by_joint;
@@ -6074,9 +6067,10 @@ void LLVOAvatar::updateAttachmentOverrides()
         }
         if (mismatched)
         {
-            LL_WARNS() << "MISMATCHED ATTACHMENT OVERRIDES, compare paranoid log files" << LL_ENDL;
+            LL_WARNS() << "MISMATCHED ATTACHMENT OVERRIDES" << LL_ENDL;
         }
     }
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -7027,7 +7021,6 @@ U32 LLVOAvatar::getNumAnimatedObjectAttachments() const
 S32 LLVOAvatar::getMaxAnimatedObjectAttachments() const
 {
     S32 max_attach = 0;
-    // AXON REMOVE AFTER SERVER TESTING DONE
     if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits"))
     {
         max_attach = MAX_AGENT_ATTACHMENTS;
-- 
cgit v1.3


From 963945b3ab258ea445e1d9757fc5a89ce397ff7b Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 25 Sep 2018 16:39:26 +0100
Subject: SL-1291 - fixed some issues with selection highlighting of objects
 rezzed while in build mode. Not clear whether this addresses the original
 issue, which isn't reproing

---
 indra/newview/llcontrolavatar.cpp | 2 +-
 indra/newview/llviewermessage.cpp | 2 +-
 indra/newview/llviewerobject.cpp  | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 96cdb7f01d..0efed8ab7c 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -508,7 +508,7 @@ void LLControlAvatar::updateAnimations()
     if (!mPlaying)
     {
         mPlaying = true;
-        if (!mRootVolp->isAnySelected())
+        //if (!mRootVolp->isAnySelected())
         {
             updateVolumeGeom();
             mRootVolp->recursiveMarkForUpdate(TRUE);
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index dc11bc28e5..b74c5b9b8a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4049,7 +4049,7 @@ void process_object_animation(LLMessageSystem *mesgsys, void **user_data)
     if (!avatarp->mPlaying)
     {
         avatarp->mPlaying = true;
-        if (!avatarp->mRootVolp->isAnySelected())
+        //if (!avatarp->mRootVolp->isAnySelected())
         {
             avatarp->updateVolumeGeom();
             avatarp->mRootVolp->recursiveMarkForUpdate(TRUE);
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f963f8a0c8..dcd09f66c7 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -3015,6 +3015,10 @@ void LLViewerObject::updateControlAvatar()
     if (getControlAvatar())
     {
         getControlAvatar()->updateAnimations();
+        if (isSelected())
+        {
+            LLSelectMgr::getInstance()->pauseAssociatedAvatars();
+        }
     }
 }
 
@@ -3040,7 +3044,7 @@ void LLViewerObject::linkControlAvatar()
         if (!cav->mPlaying)
         {
             cav->mPlaying = true;
-            if (!cav->mRootVolp->isAnySelected())
+            //if (!cav->mRootVolp->isAnySelected())
             {
                 cav->updateVolumeGeom();
                 cav->mRootVolp->recursiveMarkForUpdate(TRUE);
-- 
cgit v1.3