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/OdePlugin | |
| parent | Get rid of the pointless null checks on collision listeners. Add warning abo... (diff) | |
| download | opensim-SC_OLD-0f83f87233544972ad6799cb78e5f21845c53fbd.zip opensim-SC_OLD-0f83f87233544972ad6799cb78e5f21845c53fbd.tar.gz opensim-SC_OLD-0f83f87233544972ad6799cb78e5f21845c53fbd.tar.bz2 opensim-SC_OLD-0f83f87233544972ad6799cb78e5f21845c53fbd.tar.xz | |
Remove unused fields from CollisionEventUpdate
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 55e14bc..b6e1c4e 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1227,7 +1227,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1227 | // m_log.DebugFormat( | 1227 | // m_log.DebugFormat( |
| 1228 | // "[PHYSICS]: Adding collision event for {0}, collidedWith {1}, contact {2}", "", CollidedWith, contact); | 1228 | // "[PHYSICS]: Adding collision event for {0}, collidedWith {1}, contact {2}", "", CollidedWith, contact); |
| 1229 | 1229 | ||
| 1230 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); | 1230 | CollisionEventsThisFrame.AddCollider(CollidedWith, contact); |
| 1231 | } | 1231 | } |
| 1232 | } | 1232 | } |
| 1233 | 1233 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 4ef731d..0363885 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -3020,7 +3020,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 3020 | 3020 | ||
| 3021 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) | 3021 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) |
| 3022 | { | 3022 | { |
| 3023 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); | 3023 | CollisionEventsThisFrame.AddCollider(CollidedWith, contact); |
| 3024 | } | 3024 | } |
| 3025 | 3025 | ||
| 3026 | public void SendCollisions() | 3026 | public void SendCollisions() |