From a1f2be5e69ef04a8520229e161bdd0527badb844 Mon Sep 17 00:00:00 2001
From: meta7
Date: Sat, 7 Aug 2010 22:25:37 -0700
Subject: The real fix for unscripted sit positions. This one doesn't fuck
 everything else up. Promise.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 87cf135..fc8e0d7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2440,7 +2440,10 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             m_linkedPrim = part.UUID;
-
+            if (part.GetAvatarOnSitTarget() != UUID)
+            {
+                m_offsetRotation = m_offsetRotation / part.RotationOffset;
+            }
             Velocity = Vector3.Zero;
             RemoveFromPhysicalScene();
             Animator.TrySetMovementAnimation(sitAnimation);
-- 
cgit v1.1