From f45fa849053cccadf57a21592cdc93e93aabfd9c Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 3 Jun 2008 08:11:04 +0000 Subject: [PATCH] * Remove what should be unnecessary locking of GetScenePresences() * May help with mantis 1434 though I doubt it --- OpenSim/Region/Environment/Scenes/InnerScene.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 3e250da5a0..b6ba706c33 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -627,19 +627,13 @@ namespace OpenSim.Region.Environment.Scenes #region Get Methods /// - /// Request a List of all m_scenePresences in this World + /// Request a List of all scene presences in this scene. This returns a copy of the original list, so no + /// locking is required to iterate over it. /// /// protected internal List GetScenePresences() { - List result; - - lock (ScenePresences) - { - result = new List(ScenePresences.Values); - } - - return result; + return new List(ScenePresences.Values); } protected internal List GetAvatars()