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/ODECharacter.cs | |
| parent | Merge branch 'vehicles' into tests (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-873c9098d8627972e80a1688e85a4cda45e1e7fe.zip opensim-SC_OLD-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.gz opensim-SC_OLD-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.bz2 opensim-SC_OLD-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.xz | |
Merge branch 'careminster' into tests
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 e344f97..905d3ba 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -1231,11 +1231,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1231 | m_requestedUpdateFrequency = 0; | 1231 | m_requestedUpdateFrequency = 0; |
| 1232 | m_eventsubscription = 0; | 1232 | m_eventsubscription = 0; |
| 1233 | } | 1233 | } |
| 1234 | public void AddCollisionEvent(uint CollidedWith, float depth) | 1234 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) |
| 1235 | { | 1235 | { |
| 1236 | if (m_eventsubscription > 0) | 1236 | if (m_eventsubscription > 0) |
| 1237 | { | 1237 | { |
| 1238 | CollisionEventsThisFrame.addCollider(CollidedWith, depth); | 1238 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); |
| 1239 | } | 1239 | } |
| 1240 | } | 1240 | } |
| 1241 | 1241 | ||