From 1a7be7b00eaef0140f2dc13f3e14d8150c393b08 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Jun 2012 00:36:50 +0100
Subject: Fix a regression where we stopped removing avatars from collision
 event reporting on logout, rather than stopping clearing their collision
 events.

This occurred in b18c8c8 (Thu May 17 2012).
This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region.
---
 OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 54b69a2..f3b0630 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1270,7 +1270,7 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         public override void UnSubscribeEvents()
         {
-            CollisionEventsThisFrame.Clear();
+            _parent_scene.RemoveCollisionEventReporting(this);
 
             // Don't clear collision event reporting here.  This is called directly from scene code and so can lead
             // to a race condition with the simulate loop
-- 
cgit v1.1