aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-10-28 18:26:31 +0000
committerMelanie2009-10-28 18:26:31 +0000
commit184e85cdecfff3b07bfb42b2bcc85b83b876b483 (patch)
tree66841fa461da7255d500d2a2759b8d376ea0fa53 /OpenSim
parentAdding changes to previous patch to make it fit into core better (diff)
parentFixed a bad check on velocity in the ODE near() callback (it was only checkin... (diff)
downloadopensim-SC_OLD-184e85cdecfff3b07bfb42b2bcc85b83b876b483.zip
opensim-SC_OLD-184e85cdecfff3b07bfb42b2bcc85b83b876b483.tar.gz
opensim-SC_OLD-184e85cdecfff3b07bfb42b2bcc85b83b876b483.tar.bz2
opensim-SC_OLD-184e85cdecfff3b07bfb42b2bcc85b83b876b483.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs6
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