diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 39f94cb..3d0855f 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
113 | public bool collidelock = false; | 113 | public bool collidelock = false; |
114 | 114 | ||
115 | public int m_eventsubscription = 0; | 115 | public int m_eventsubscription = 0; |
116 | private CollisionEventUpdate CollisionEventsThisFrame = null; | 116 | private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate(); |
117 | 117 | ||
118 | public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size) | 118 | public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size) |
119 | { | 119 | { |
@@ -869,9 +869,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
869 | public override void SubscribeEvents(int ms) | 869 | public override void SubscribeEvents(int ms) |
870 | { | 870 | { |
871 | m_eventsubscription = ms; | 871 | m_eventsubscription = ms; |
872 | _parent_scene.addCollisionEventReporting(this); | ||
872 | } | 873 | } |
873 | public override void UnSubscribeEvents() | 874 | public override void UnSubscribeEvents() |
874 | { | 875 | { |
876 | _parent_scene.remCollisionEventReporting(this); | ||
875 | m_eventsubscription = 0; | 877 | m_eventsubscription = 0; |
876 | } | 878 | } |
877 | public void AddCollisionEvent(uint CollidedWith, float depth) | 879 | public void AddCollisionEvent(uint CollidedWith, float depth) |