diff options
author | Kitto Flora | 2009-12-17 02:54:02 -0500 |
---|---|---|
committer | Kitto Flora | 2009-12-17 02:54:02 -0500 |
commit | 6483470ec5e9000fb6a85bbdfe5b79be6f336a74 (patch) | |
tree | 96822de6a1e714485702e026ff2599a03bd02b16 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | Merge branch 'tests' (diff) | |
download | opensim-SC_OLD-6483470ec5e9000fb6a85bbdfe5b79be6f336a74.zip opensim-SC_OLD-6483470ec5e9000fb6a85bbdfe5b79be6f336a74.tar.gz opensim-SC_OLD-6483470ec5e9000fb6a85bbdfe5b79be6f336a74.tar.bz2 opensim-SC_OLD-6483470ec5e9000fb6a85bbdfe5b79be6f336a74.tar.xz |
Fix GetWorldRotation(), and a host of related Sit fixes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index c27c420..688be83 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2673,7 +2673,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
2673 | 2673 | ||
2674 | m_lastposition = _position; | 2674 | m_lastposition = _position; |
2675 | m_lastorientation = _orientation; | 2675 | m_lastorientation = _orientation; |
2676 | 2676 | ||
2677 | l_position.X = vec.X; | 2677 | l_position.X = vec.X; |
2678 | l_position.Y = vec.Y; | 2678 | l_position.Y = vec.Y; |
2679 | l_position.Z = vec.Z; | 2679 | l_position.Z = vec.Z; |
@@ -2681,6 +2681,10 @@ Console.WriteLine(" JointCreateFixed"); | |||
2681 | l_orientation.Y = ori.Y; | 2681 | l_orientation.Y = ori.Y; |
2682 | l_orientation.Z = ori.Z; | 2682 | l_orientation.Z = ori.Z; |
2683 | l_orientation.W = ori.W; | 2683 | l_orientation.W = ori.W; |
2684 | |||
2685 | // if(l_position.Y != m_lastposition.Y){ | ||
2686 | // Console.WriteLine("UP&V {0} {1}", m_primName, l_position); | ||
2687 | // } | ||
2684 | 2688 | ||
2685 | if (l_position.X > ((int)_parent_scene.WorldExtents.X - 0.05f) || l_position.X < 0f || l_position.Y > ((int)_parent_scene.WorldExtents.Y - 0.05f) || l_position.Y < 0f) | 2689 | if (l_position.X > ((int)_parent_scene.WorldExtents.X - 0.05f) || l_position.X < 0f || l_position.Y > ((int)_parent_scene.WorldExtents.Y - 0.05f) || l_position.Y < 0f) |
2686 | { | 2690 | { |