From e1a86494e1ca981e82de9237c37f9ff9f023063d Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 27 Sep 2018 19:34:41 +0100
Subject: [PATCH] SL-1350 - keep control avatar rotation synced to
 corresponding root drawable

---
 indra/newview/llcontrolavatar.cpp | 11 ++++++++++-
 indra/newview/lldrawable.cpp      |  5 ++++-
 indra/newview/llvoavatar.cpp      |  3 ++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 1fc9b7cacd..bb665cc31d 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -175,7 +175,16 @@ void LLControlAvatar::matchVolumeTransform()
             // complexity info and such line up better. Should defer
             // this until avatars also get fixed.
 
-            LLQuaternion obj_rot = mRootVolp->getRotation();
+            LLQuaternion obj_rot;
+            if (mRootVolp->mDrawable)
+            {
+                obj_rot = mRootVolp->mDrawable->getRotation();
+            }
+            else
+            {
+                obj_rot = mRootVolp->getRotation();
+            }
+            
 			LLMatrix3 bind_mat;
 
             LLQuaternion bind_rot;
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 332b4c265a..d0c3dafc94 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -52,7 +52,6 @@
 #include "llviewerwindow.h"
 #include "llvocache.h"
 #include "llcontrolavatar.h"
-#include "llcallstack.h"
 #include "lldrawpoolavatar.h"
 
 const F32 MIN_INTERPOLATE_DISTANCE_SQUARED = 0.001f * 0.001f;
@@ -730,6 +729,10 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	mXform.setRotation(target_rot);
 	mXform.setScale(LLVector3(1,1,1)); //no scale in drawable transforms (IT'S A RULE!)
 	mXform.updateMatrix();
+    if (isRoot() && mVObjp->isAnimatedObject() && mVObjp->getControlAvatar())
+    {
+        mVObjp->getControlAvatar()->matchVolumeTransform();
+    }
 
 	if (mSpatialBridge)
 	{
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 5d6d577146..1dd1e04915 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4756,7 +4756,8 @@ void LLVOAvatar::updateRootPositionAndRotation(LLAgent& agent, F32 speed, bool w
         LLControlAvatar *cav = dynamic_cast<LLControlAvatar*>(this);
         if (cav)
         {
-            cav->matchVolumeTransform();
+            // SL-1350: Moved to LLDrawable::updateXform()
+            //cav->matchVolumeTransform();
         }
         else
         {