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/ODEPrim.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Removing Console.WriteLine()s that were brought in with the revert (diff) | |
| download | opensim-SC_OLD-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.zip opensim-SC_OLD-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.gz opensim-SC_OLD-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.bz2 opensim-SC_OLD-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 5ff9d32..f4b502a 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -2958,11 +2958,11 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2958 | m_eventsubscription = 0; | 2958 | m_eventsubscription = 0; |
| 2959 | } | 2959 | } |
| 2960 | 2960 | ||
| 2961 | public void AddCollisionEvent(uint CollidedWith, float depth) | 2961 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) |
| 2962 | { | 2962 | { |
| 2963 | if (CollisionEventsThisFrame == null) | 2963 | if (CollisionEventsThisFrame == null) |
| 2964 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 2964 | CollisionEventsThisFrame = new CollisionEventUpdate(); |
| 2965 | CollisionEventsThisFrame.addCollider(CollidedWith,depth); | 2965 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); |
| 2966 | } | 2966 | } |
| 2967 | 2967 | ||
| 2968 | public void SendCollisions() | 2968 | public void SendCollisions() |