From 65304260af283211443a2872c46f6609d3e45649 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 23 Nov 2013 02:09:03 +0000
Subject: fix avatar rotation when sitting on a linked part

Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c88025c..7a1017f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2591,7 +2591,7 @@ namespace OpenSim.Region.Framework.Scenes
                     //Quaternion result = (sitTargetOrient * vq) * nq;
 
                     m_pos = sitTargetPos + SIT_TARGET_ADJUSTMENT + part.OffsetPosition;
-                    Rotation = sitTargetOrient;
+                    Rotation = part.RotationOffset * sitTargetOrient;
                     ParentPosition = part.AbsolutePosition;
                 }
                 else
-- 
cgit v1.1