From 6632eb7c051e2638ea1c58c2876e7d6825398556 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 13 Sep 2012 13:51:42 -0700
Subject: BulletSim: Remove calculation and passing of unused collied object
 type. Fix collision code to properly sense mega-region children regions as
 terrain. When setting an object physical, reset all the physical properties
 (friction, ...).

---
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 26 ++++++++++---------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 9c958d5..c38867f 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -583,27 +583,21 @@ public class BSScene : PhysicsScene, IPhysicsParameters
             return;         // don't send collisions to the terrain
         }
 
-        BSPhysObject collider = PhysObjects[localID];
-        // TODO: as of this code, terrain was not in the physical object list.
-        //    When BSTerrain is created and it will be in the list, we can remove
-        //    the possibility that it's not there and just fetch the collidee.
-        BSPhysObject collidee = null;
-
-        ActorTypes type = ActorTypes.Prim;
-        if (collidingWith <= TerrainManager.HighestTerrainID)
+        BSPhysObject collider;
+        if (!PhysObjects.TryGetValue(localID, out collider))
         {
-            type = ActorTypes.Ground;
-        }
-        else
-        {
-            collidee = PhysObjects[collidingWith];
-            if (collidee is BSCharacter)
-                type = ActorTypes.Agent;
+            // If the object that is colliding cannot be found, just ignore the collision.
+            return;
         }
 
+        // The terrain is not in the physical object list so 'collidee'
+        //    can be null when Collide() is called.
+        BSPhysObject collidee = null;
+        PhysObjects.TryGetValue(collidingWith, out collidee);
+
         // DetailLog("{0},BSScene.SendCollision,collide,id={1},with={2}", DetailLogZero, localID, collidingWith);
 
-        if (collider.Collide(collidingWith, collidee, type, collidePoint, collideNormal, penetration))
+        if (collider.Collide(collidingWith, collidee, collidePoint, collideNormal, penetration))
         {
             // If a collision was posted, remember to send it to the simulator
             m_objectsWithCollisions.Add(collider);
-- 
cgit v1.1