From e8acb49fefc0e567510b4058b6571599a0158b62 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 3 May 2008 15:39:40 +0000
Subject: * For your fragging desire, damage enabled land works, but watch
 out!, life does not regenerate until you're dead!

---
 OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/OdePlugin')

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
         public bool collidelock = false;
 
         public int m_eventsubscription = 0;
-        private CollisionEventUpdate CollisionEventsThisFrame = null;
+        private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
 
         public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size)
         {
@@ -869,9 +869,11 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override void SubscribeEvents(int ms)
         {
             m_eventsubscription = ms;
+            _parent_scene.addCollisionEventReporting(this);
         }
         public override void UnSubscribeEvents()
         {
+            _parent_scene.remCollisionEventReporting(this);
             m_eventsubscription = 0;
         }
         public void AddCollisionEvent(uint CollidedWith, float depth)
-- 
cgit v1.1