OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix

avinationmerge
UbitUmarov 2014-07-21 19:15:51 +01:00
parent 72cead2920
commit 726490a994
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
View File

@ -950,13 +950,13 @@ namespace OpenSim.Region.Physics.OdePlugin
bool noskip = true; bool noskip = true;
if (dop1ava) if (dop1ava)
{ {
if (!(((OdeCharacter)p1).Collide(g1, false, ref curContact, ref FeetCollision))) if (!(((OdeCharacter)p1).Collide(g1,g2, false, ref curContact, ref FeetCollision)))
noskip = false; noskip = false;
} }
else if (dop2ava) else if (dop2ava)
{ {
if (!(((OdeCharacter)p2).Collide(g2, true, ref curContact, ref FeetCollision))) if (!(((OdeCharacter)p2).Collide(g2,g1, true, ref curContact, ref FeetCollision)))
noskip = false; noskip = false;
} }
@ -1095,10 +1095,11 @@ namespace OpenSim.Region.Physics.OdePlugin
// do colisions with static space // do colisions with static space
d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback); d.SpaceCollide2(chr.collider, StaticSpace, IntPtr.Zero, nearCallback);
// chars with chars
d.SpaceCollide(CharsSpace, IntPtr.Zero, nearCallback);
// no coll with gnd // no coll with gnd
} }
// chars with chars
d.SpaceCollide(CharsSpace, IntPtr.Zero, nearCallback);
} }
catch (AccessViolationException) catch (AccessViolationException)
{ {