aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-07-19 22:59:28 +0100
committerJustin Clark-Casey (justincc)2012-07-19 22:59:28 +0100
commite94831ddab282f2d84d0dad0b28e7cce6ac4c4b0 (patch)
treedcc956a3d6dc15069b6b22c0602b2b53d48c45a6 /OpenSim/Region/Framework/Scenes/Animation
parentminor: remove some mono compiler warnings (diff)
downloadopensim-SC-e94831ddab282f2d84d0dad0b28e7cce6ac4c4b0.zip
opensim-SC-e94831ddab282f2d84d0dad0b28e7cce6ac4c4b0.tar.gz
opensim-SC-e94831ddab282f2d84d0dad0b28e7cce6ac4c4b0.tar.bz2
opensim-SC-e94831ddab282f2d84d0dad0b28e7cce6ac4c4b0.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs8
1 files changed, 1 insertions, 7 deletions
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
535 535
536 SendAnimPack(animIDs, sequenceNums, objectIDs); 536 SendAnimPack(animIDs, sequenceNums, objectIDs);
537 } 537 }
538
539 public void Close()
540 {
541 m_animations = null;
542 m_scenePresence = null;
543 }
544 } 538 }
545} 539} \ No newline at end of file