diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 9e36020..8382233 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -772,7 +772,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
772 | 772 | ||
773 | lock (contacts) | 773 | lock (contacts) |
774 | { | 774 | { |
775 | count = d.Collide(g1, g2, contacts.GetLength(0), contacts, d.ContactGeom.SizeOf); | 775 | count = d.Collide(g1, g2, contacts.Length, contacts, d.ContactGeom.SizeOf); |
776 | } | 776 | } |
777 | } | 777 | } |
778 | catch (SEHException) | 778 | catch (SEHException) |
@@ -830,7 +830,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
830 | p2.CollidingObj = true; | 830 | p2.CollidingObj = true; |
831 | break; | 831 | break; |
832 | case (int)ActorTypes.Prim: | 832 | case (int)ActorTypes.Prim: |
833 | if (p2.Velocity.X > 0 || p2.Velocity.Y > 0 || p2.Velocity.Z > 0) | 833 | if (p2.Velocity.LengthSquared() > 0.0f) |
834 | p2.CollidingObj = true; | 834 | p2.CollidingObj = true; |
835 | break; | 835 | break; |
836 | case (int)ActorTypes.Unknown: | 836 | case (int)ActorTypes.Unknown: |
@@ -1014,7 +1014,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1014 | if (!skipThisContact && checkDupe(contacts[i], p2.PhysicsActorType)) | 1014 | if (!skipThisContact && checkDupe(contacts[i], p2.PhysicsActorType)) |
1015 | skipThisContact = true; | 1015 | skipThisContact = true; |
1016 | 1016 | ||
1017 | int maxContactsbeforedeath = 4000; | 1017 | const int maxContactsbeforedeath = 4000; |
1018 | joint = IntPtr.Zero; | 1018 | joint = IntPtr.Zero; |
1019 | 1019 | ||
1020 | 1020 | ||