Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Framework/Watchdog.cs

1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index bb8d601..8782e62 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -1350,7 +1350,7 @@ public sealed class BSPrim : PhysicsActor
         // create the event for the collision
         Dictionary<uint, ContactPoint> contactPoints = new Dictionary<uint, ContactPoint>();
         contactPoints.Add(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
-        CollisionEventUpdate args = new CollisionEventUpdate(LocalID, (int)type, 1, contactPoints);
+        CollisionEventUpdate args = new CollisionEventUpdate(contactPoints);
         base.SendCollisionUpdate(args);
     }
 }