diff options
| author | Justin Clark-Casey (justincc) | 2011-10-25 22:39:08 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-25 22:39:08 +0100 |
| commit | 0f83f87233544972ad6799cb78e5f21845c53fbd (patch) | |
| tree | 1601a52b9fd552cf700e36f67d8bd75070212e0c /OpenSim/Region/Physics/BulletSPlugin | |
| parent | Get rid of the pointless null checks on collision listeners. Add warning abo... (diff) | |
| download | opensim-SC-0f83f87233544972ad6799cb78e5f21845c53fbd.zip opensim-SC-0f83f87233544972ad6799cb78e5f21845c53fbd.tar.gz opensim-SC-0f83f87233544972ad6799cb78e5f21845c53fbd.tar.bz2 opensim-SC-0f83f87233544972ad6799cb78e5f21845c53fbd.tar.xz | |
Remove unused fields from CollisionEventUpdate
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 682eb80..9a6857b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -443,7 +443,7 @@ public class BSCharacter : PhysicsActor | |||
| 443 | 443 | ||
| 444 | Dictionary<uint, ContactPoint> contactPoints = new Dictionary<uint, ContactPoint>(); | 444 | Dictionary<uint, ContactPoint> contactPoints = new Dictionary<uint, ContactPoint>(); |
| 445 | contactPoints.Add(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth)); | 445 | contactPoints.Add(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth)); |
| 446 | CollisionEventUpdate args = new CollisionEventUpdate(LocalID, (int)type, 1, contactPoints); | 446 | CollisionEventUpdate args = new CollisionEventUpdate(contactPoints); |
| 447 | base.SendCollisionUpdate(args); | 447 | base.SendCollisionUpdate(args); |
| 448 | } | 448 | } |
| 449 | 449 | ||
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 | |||
| 1350 | // create the event for the collision | 1350 | // create the event for the collision |
| 1351 | Dictionary<uint, ContactPoint> contactPoints = new Dictionary<uint, ContactPoint>(); | 1351 | Dictionary<uint, ContactPoint> contactPoints = new Dictionary<uint, ContactPoint>(); |
| 1352 | contactPoints.Add(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth)); | 1352 | contactPoints.Add(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth)); |
| 1353 | CollisionEventUpdate args = new CollisionEventUpdate(LocalID, (int)type, 1, contactPoints); | 1353 | CollisionEventUpdate args = new CollisionEventUpdate(contactPoints); |
| 1354 | base.SendCollisionUpdate(args); | 1354 | base.SendCollisionUpdate(args); |
| 1355 | } | 1355 | } |
| 1356 | } | 1356 | } |