aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs5
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs8
3 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 7766691..4f461ad 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1229,11 +1229,14 @@ namespace OpenSim.Region.Physics.OdePlugin
1229 m_requestedUpdateFrequency = 0; 1229 m_requestedUpdateFrequency = 0;
1230 m_eventsubscription = 0; 1230 m_eventsubscription = 0;
1231 } 1231 }
1232 1232
1233 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) 1233 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
1234 { 1234 {
1235 if (m_eventsubscription > 0) 1235 if (m_eventsubscription > 0)
1236 { 1236 {
1237// m_log.DebugFormat(
1238// "[PHYSICS]: Adding collision event for {0}, collidedWith {1}, contact {2}", "", CollidedWith, contact);
1239
1237 CollisionEventsThisFrame.addCollider(CollidedWith, contact); 1240 CollisionEventsThisFrame.addCollider(CollidedWith, contact);
1238 } 1241 }
1239 } 1242 }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 34c0deb..44eafb7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1457,7 +1457,6 @@ Console.WriteLine("changeadd 1");
1457 { 1457 {
1458 if (m_isphysical) 1458 if (m_isphysical)
1459 { 1459 {
1460
1461 if (!m_disabled && !m_taintremove && !childPrim) 1460 if (!m_disabled && !m_taintremove && !childPrim)
1462 { 1461 {
1463 if (Body == IntPtr.Zero) 1462 if (Body == IntPtr.Zero)
@@ -2999,6 +2998,7 @@ Console.WriteLine("changeshape not need meshing");
2999 { 2998 {
3000 if (CollisionEventsThisFrame == null) 2999 if (CollisionEventsThisFrame == null)
3001 CollisionEventsThisFrame = new CollisionEventUpdate(); 3000 CollisionEventsThisFrame = new CollisionEventUpdate();
3001
3002 CollisionEventsThisFrame.addCollider(CollidedWith, contact); 3002 CollisionEventsThisFrame.addCollider(CollidedWith, contact);
3003 } 3003 }
3004 3004
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)