aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorCharles Krinke2008-08-07 15:15:57 +0000
committerCharles Krinke2008-08-07 15:15:57 +0000
commite8293801c558dc70d28afb0d6207e935dd7d3a45 (patch)
tree59d42d09d446f6112675cb8dc020bc6c57da7821 /OpenSim/Region/Environment
parentMantis#1899. Thank you kindly, Cmickeyb for a patch that: (diff)
downloadopensim-SC_OLD-e8293801c558dc70d28afb0d6207e935dd7d3a45.zip
opensim-SC_OLD-e8293801c558dc70d28afb0d6207e935dd7d3a45.tar.gz
opensim-SC_OLD-e8293801c558dc70d28afb0d6207e935dd7d3a45.tar.bz2
opensim-SC_OLD-e8293801c558dc70d28afb0d6207e935dd7d3a45.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
2 files changed, 2 insertions, 2 deletions
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
812 ); 812 );
813 } 813 }
814 814
815 set { m_sitTargetOrientation = new Quaternion(value.X, value.Y, value.Z, value.W); } 815 set { m_sitTargetOrientation = new Quaternion(value.W, value.X, value.Y, value.Z); }
816 } 816 }
817 817
818 818
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
1156 part.SetAvatarOnSitTarget(UUID); 1156 part.SetAvatarOnSitTarget(UUID);
1157 offset = new LLVector3(avSitOffSet.x, avSitOffSet.y, avSitOffSet.z); 1157 offset = new LLVector3(avSitOffSet.x, avSitOffSet.y, avSitOffSet.z);
1158 sitOrientation = 1158 sitOrientation =
1159 new LLQuaternion(avSitOrientation.w, avSitOrientation.x, avSitOrientation.y, avSitOrientation.z); 1159 new LLQuaternion(avSitOrientation.x, avSitOrientation.y, avSitOrientation.z, avSitOrientation.w);
1160 autopilot = false; 1160 autopilot = false;
1161 } 1161 }
1162 1162