aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index e1e031f..8a24190 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.Physics.OdePlugin
100 Rubber = 6 100 Rubber = 6
101 } 101 }
102 102
103 public sealed class OdeScene : PhysicsScene 103 public class OdeScene : PhysicsScene
104 { 104 {
105 private readonly ILog m_log; 105 private readonly ILog m_log;
106 // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); 106 // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
@@ -957,7 +957,6 @@ namespace OpenSim.Region.Physics.OdePlugin
957 character.SetPidStatus(true); 957 character.SetPidStatus(true);
958 } 958 }
959 } 959 }
960
961 960
962 if (p1.PhysicsActorType == (int) ActorTypes.Agent) 961 if (p1.PhysicsActorType == (int) ActorTypes.Agent)
963 { 962 {
@@ -1058,9 +1057,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1058 { 1057 {
1059 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]); 1058 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
1060 m_global_contactcount++; 1059 m_global_contactcount++;
1061
1062 } 1060 }
1063
1064 } 1061 }
1065 else 1062 else
1066 { 1063 {
@@ -1083,7 +1080,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1083 { 1080 {
1084 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]); 1081 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
1085 m_global_contactcount++; 1082 m_global_contactcount++;
1086
1087 } 1083 }
1088 } 1084 }
1089 } 1085 }
@@ -1295,6 +1291,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1295 1291
1296 //returncollisions = true; 1292 //returncollisions = true;
1297 break; 1293 break;
1294
1298 case ActorTypes.Prim: 1295 case ActorTypes.Prim:
1299 if (p1 is OdePrim) 1296 if (p1 is OdePrim)
1300 { 1297 {
@@ -1322,6 +1319,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1322 1319
1323 cc2.AddCollisionEvent(obj2LocalID, contact); 1320 cc2.AddCollisionEvent(obj2LocalID, contact);
1324 break; 1321 break;
1322
1325 case ActorTypes.Prim: 1323 case ActorTypes.Prim:
1326 1324
1327 if (p2 is OdePrim) 1325 if (p2 is OdePrim)