From e94831ddab282f2d84d0dad0b28e7cce6ac4c4b0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Jul 2012 22:59:28 +0100
Subject: Stop explicitly closing and nulling out Animator in order to prevent
 NREs in various places due to race conditions.

Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking.
The memory used is small and these should be GC'd anyway when the SP is released.  If this is not happening then the wider problem of old SPs being retained needs to be resolved.
---
 .../Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Animation')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 14ae287..ff53f45 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -535,11 +535,5 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             SendAnimPack(animIDs, sequenceNums, objectIDs);
         }
-
-        public void Close()
-        {
-            m_animations = null;
-            m_scenePresence = null;
-        }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1