diff options
| author | KittoFlora | 2009-11-16 01:40:15 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-16 01:40:15 +0100 |
| commit | 873c9098d8627972e80a1688e85a4cda45e1e7fe (patch) | |
| tree | a0edc24aef11d5ad6928493d8985386f48dd2607 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
| parent | Merge branch 'vehicles' into tests (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.zip opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.gz opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.bz2 opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.xz | |
Merge branch 'careminster' into tests
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 62c5c81..b963d65 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -3030,11 +3030,11 @@ if(frcount == 0) Console.WriteLine("mass= " + m_mass + " servo= " + RLAservo + | |||
| 3030 | m_eventsubscription = 0; | 3030 | m_eventsubscription = 0; |
| 3031 | } | 3031 | } |
| 3032 | 3032 | ||
| 3033 | public void AddCollisionEvent(uint CollidedWith, float depth) | 3033 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) |
| 3034 | { | 3034 | { |
| 3035 | if (CollisionEventsThisFrame == null) | 3035 | if (CollisionEventsThisFrame == null) |
| 3036 | CollisionEventsThisFrame = new CollisionEventUpdate(); | 3036 | CollisionEventsThisFrame = new CollisionEventUpdate(); |
| 3037 | CollisionEventsThisFrame.addCollider(CollidedWith,depth); | 3037 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); |
| 3038 | } | 3038 | } |
| 3039 | 3039 | ||
| 3040 | public void SendCollisions() | 3040 | public void SendCollisions() |