ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Melanie
2009-10-28 18:26:31 +00:00
parent c17359fea5 ee0f7e10c8
commit 184e85cdec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@@ -772,7 +772,7 @@ namespace OpenSim.Region.Physics.OdePlugin
lock (contacts)
{
count = d.Collide(g1, g2, contacts.GetLength(0), contacts, d.ContactGeom.SizeOf);
count = d.Collide(g1, g2, contacts.Length, contacts, d.ContactGeom.SizeOf);
}
}
catch (SEHException)
@@ -830,7 +830,7 @@ namespace OpenSim.Region.Physics.OdePlugin
p2.CollidingObj = true;
break;
case (int)ActorTypes.Prim:
if (p2.Velocity.X > 0 || p2.Velocity.Y > 0 || p2.Velocity.Z > 0)
if (p2.Velocity.LengthSquared() > 0.0f)
p2.CollidingObj = true;
break;
case (int)ActorTypes.Unknown:
@@ -1014,7 +1014,7 @@ namespace OpenSim.Region.Physics.OdePlugin
if (!skipThisContact && checkDupe(contacts[i], p2.PhysicsActorType))
skipThisContact = true;
int maxContactsbeforedeath = 4000;
const int maxContactsbeforedeath = 4000;
joint = IntPtr.Zero;