From e8293801c558dc70d28afb0d6207e935dd7d3a45 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Thu, 7 Aug 2008 15:15:57 +0000
Subject: Mantis#1901. Thank you kindly, Nlin for a patch that: More sitting
 fixes: Inconsistent sitting position on rezzed prims that have no sit target
 set.

---
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 +-
 OpenSim/Region/Environment/Scenes/ScenePresence.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 675322a..efcad22 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -812,7 +812,7 @@ namespace OpenSim.Region.Environment.Scenes
                                         );
             }
 
-            set { m_sitTargetOrientation = new Quaternion(value.X, value.Y, value.Z, value.W); }
+            set { m_sitTargetOrientation = new Quaternion(value.W, value.X, value.Y, value.Z); }
         }
 
 
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 626a71c..e37b26b 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1156,7 +1156,7 @@ namespace OpenSim.Region.Environment.Scenes
                     part.SetAvatarOnSitTarget(UUID);
                     offset = new LLVector3(avSitOffSet.x, avSitOffSet.y, avSitOffSet.z);
                     sitOrientation =
-                        new LLQuaternion(avSitOrientation.w, avSitOrientation.x, avSitOrientation.y, avSitOrientation.z);
+                        new LLQuaternion(avSitOrientation.x, avSitOrientation.y, avSitOrientation.z, avSitOrientation.w);
                     autopilot = false;
                 }
 
-- 
cgit v1.1