From 4d4255c27b45ed5e32fe7c4870e2ce3ed10cb140 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: SL-1350 - keep control avatar rotation synced to corresponding root
 drawable

---
 indra/newview/llvoavatar.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index dba99c7e98..1f72aed5b4 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -4168,7 +4168,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
         {
-- 
cgit v1.2.3