diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 6b74e74..4f461ad 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -1220,18 +1220,23 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1220 | { | 1220 | { |
1221 | m_requestedUpdateFrequency = ms; | 1221 | m_requestedUpdateFrequency = ms; |
1222 | m_eventsubscription = ms; | 1222 | m_eventsubscription = ms; |
1223 | _parent_scene.addCollisionEventReporting(this); | 1223 | _parent_scene.AddCollisionEventReporting(this); |
1224 | } | 1224 | } |
1225 | |||
1225 | public override void UnSubscribeEvents() | 1226 | public override void UnSubscribeEvents() |
1226 | { | 1227 | { |
1227 | _parent_scene.remCollisionEventReporting(this); | 1228 | _parent_scene.RemoveCollisionEventReporting(this); |
1228 | m_requestedUpdateFrequency = 0; | 1229 | m_requestedUpdateFrequency = 0; |
1229 | m_eventsubscription = 0; | 1230 | m_eventsubscription = 0; |
1230 | } | 1231 | } |
1232 | |||
1231 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) | 1233 | public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) |
1232 | { | 1234 | { |
1233 | if (m_eventsubscription > 0) | 1235 | if (m_eventsubscription > 0) |
1234 | { | 1236 | { |
1237 | // m_log.DebugFormat( | ||
1238 | // "[PHYSICS]: Adding collision event for {0}, collidedWith {1}, contact {2}", "", CollidedWith, contact); | ||
1239 | |||
1235 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); | 1240 | CollisionEventsThisFrame.addCollider(CollidedWith, contact); |
1236 | } | 1241 | } |
1237 | } | 1242 | } |
@@ -1248,6 +1253,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1248 | m_eventsubscription = 0; | 1253 | m_eventsubscription = 0; |
1249 | } | 1254 | } |
1250 | } | 1255 | } |
1256 | |||
1251 | public override bool SubscribedEvents() | 1257 | public override bool SubscribedEvents() |
1252 | { | 1258 | { |
1253 | if (m_eventsubscription > 0) | 1259 | if (m_eventsubscription > 0) |