aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs12
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
index 86d41ea..0837bfb 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs
@@ -951,8 +951,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
951 SharedTmpcontact.surface.mu = mu; 951 SharedTmpcontact.surface.mu = mu;
952 SharedTmpcontact.surface.bounce = bounce; 952 SharedTmpcontact.surface.bounce = bounce;
953 953
954 d.ContactGeom altContact = new d.ContactGeom();
955 bool useAltcontact = false;
956 bool noskip = true; 954 bool noskip = true;
957 955
958 if(dop1ava || dop2ava) 956 if(dop1ava || dop2ava)
@@ -961,11 +959,10 @@ namespace OpenSim.Region.PhysicsModule.ubOde
961 while (true) 959 while (true)
962 { 960 {
963 noskip = true; 961 noskip = true;
964 useAltcontact = false;
965 962
966 if (dop1ava) 963 if (dop1ava)
967 { 964 {
968 if ((((OdeCharacter)p1).Collide(g1, g2, false, ref curContact, ref altContact , ref useAltcontact, ref FeetCollision))) 965 if ((((OdeCharacter)p1).Collide(g1, g2, false, ref curContact, ref FeetCollision)))
969 { 966 {
970 if (p2.PhysicsActorType == (int)ActorTypes.Agent) 967 if (p2.PhysicsActorType == (int)ActorTypes.Agent)
971 { 968 {
@@ -980,7 +977,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
980 } 977 }
981 else if (dop2ava) 978 else if (dop2ava)
982 { 979 {
983 if ((((OdeCharacter)p2).Collide(g2, g1, true, ref curContact, ref altContact , ref useAltcontact, ref FeetCollision))) 980 if ((((OdeCharacter)p2).Collide(g2, g1, true, ref curContact, ref FeetCollision)))
984 { 981 {
985 if (p1.PhysicsActorType == (int)ActorTypes.Agent) 982 if (p1.PhysicsActorType == (int)ActorTypes.Agent)
986 { 983 {
@@ -996,10 +993,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
996 993
997 if (noskip) 994 if (noskip)
998 { 995 {
999 if(useAltcontact) 996 Joint = CreateContacJoint(ref curContact,smoothMesh);
1000 Joint = CreateContacJoint(ref altContact,smoothMesh);
1001 else
1002 Joint = CreateContacJoint(ref curContact,smoothMesh);
1003 997
1004 if (Joint == IntPtr.Zero) 998 if (Joint == IntPtr.Zero)
1005 break; 999 break;