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/BSPhysObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 969c53e..3fe71e1 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -41,7 +41,7 @@ public abstract class BSPhysObject : PhysicsActor
 {
     public abstract BSLinkset Linkset { get; set; }
 
-    public abstract bool Collide(uint collidingWith, BSPhysObject collidee, ActorTypes type,
+    public abstract bool Collide(uint collidingWith, BSPhysObject collidee,
             OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth);
     public abstract void SendCollisions();
 
-- 
cgit v1.1