diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 675322aa64..efcad22700 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 626a71cdb8..e37b26b875 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;
                 }