diff options
| author | KittoFlora | 2009-11-15 22:20:51 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-15 22:20:51 +0100 |
| commit | ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee (patch) | |
| tree | e218f290178d98e63aa8ab6aef46c1715195c32e /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make GroupRootUpdate be a terse update. This method is not used by opensim (i... (diff) | |
| download | opensim-SC-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.zip opensim-SC-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.gz opensim-SC-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.bz2 opensim-SC-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index f4b502a..fa42023 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -2643,7 +2643,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2643 | //outofBounds = true; | 2643 | //outofBounds = true; |
| 2644 | } | 2644 | } |
| 2645 | 2645 | ||
| 2646 | float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)); | 2646 | // float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)); |
| 2647 | //Console.WriteLine("Adiff " + m_primName + " = " + Adiff); | 2647 | //Console.WriteLine("Adiff " + m_primName + " = " + Adiff); |
| 2648 | if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) | 2648 | if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) |
| 2649 | && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) | 2649 | && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) |