diff options
| author | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
| commit | af0e5d097480de264e7501e7d5d35328be5640bb (patch) | |
| tree | 4ca5cd796ed9618dc9134a6e5eee1f7e7912bee4 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
| parent | minor: remove some mono compiler warnings (diff) | |
| parent | Fixed a couple of NREs in corner cases. (diff) | |
| download | opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.zip opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.gz opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.bz2 opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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 | ||