diff options
| author | KittoFlora | 2009-11-02 21:53:51 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-02 21:53:51 +0100 |
| commit | 2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a (patch) | |
| tree | e44fc76f1cb7154ecbdfa6e36f961fdc5be311c3 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Removing Console.WriteLine()s that were brought in with the revert (diff) | |
| download | opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.zip opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.gz opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.bz2 opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index c86bc62..1bc4a25 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1209,11 +1209,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1209 | m_requestedUpdateFrequency = 0; | 1209 | m_requestedUpdateFrequency = 0; |
| 1210 | m_eventsubscription = 0; | 1210 | m_eventsubscription = 0; |
| 1211 | } | 1211 | } |
| 1212 | public void AddCollisionEvent(uint CollidedWith, float depth) | 1212 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) |
| 1213 | { | 1213 | { |
| 1214 | if (m_eventsubscription > 0) | 1214 | if (m_eventsubscription > 0) |
| 1215 | { | 1215 | { |
| 1216 | CollisionEventsThisFrame.addCollider(CollidedWith, depth); | 1216 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); |
| 1217 | } | 1217 | } |
| 1218 | } | 1218 | } |
| 1219 | 1219 | ||