From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.

---
 OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs

(limited to 'OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs')

diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
old mode 100644
new mode 100755
index 55b5da0..563dcfa
--- a/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSPrimLinkable.cs
@@ -203,15 +203,14 @@ public class BSPrimLinkable : BSPrimDisplaced
     // Called after a simulation step to post a collision with this object.
     // This returns 'true' if the collision has been queued and the SendCollisions call must
     //     be made at the end of the simulation step.
-    public override bool Collide(uint collidingWith, BSPhysObject collidee,
-                    OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth)
+    public override bool Collide(BSPhysObject collidee, OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth)
     {
         bool ret = false;
         // Ask the linkset if it wants to handle the collision
-        if (!Linkset.HandleCollide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth))
+        if (!Linkset.HandleCollide(this, collidee, contactPoint, contactNormal, pentrationDepth))
         {
             // The linkset didn't handle it so pass the collision through normal processing
-            ret = base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
+            ret = base.Collide(collidee, contactPoint, contactNormal, pentrationDepth);
         }
         return ret;
     }
-- 
cgit v1.1