From e992ca025571a891333a57012c2cd4419b6581e5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 6 Oct 2009 15:39:53 -0700
Subject: Rewrote parts of the code that were double-locking different objects.
 This is about half of the code base reviewed.

---
 .../CoreModules/Avatar/Friends/FriendsModule.cs    | 42 ++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index fc7d63a..4abad81 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -442,42 +442,46 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         private ScenePresence GetRootPresenceFromAgentID(UUID AgentID)
         {
-            ScenePresence returnAgent = null;
+            List<Scene> scenes = null;
             lock (m_scenes)
+                scenes = new List<Scene>(m_scenes.Values);
+
+            ScenePresence returnAgent = null;
+            ScenePresence queryagent = null;
+            foreach (Scene scene in scenes)
             {
-                ScenePresence queryagent = null;
-                foreach (Scene scene in m_scenes.Values)
+                queryagent = scene.GetScenePresence(AgentID);
+                if (queryagent != null)
                 {
-                    queryagent = scene.GetScenePresence(AgentID);
-                    if (queryagent != null)
+                    if (!queryagent.IsChildAgent)
                     {
-                        if (!queryagent.IsChildAgent)
-                        {
-                            returnAgent = queryagent;
-                            break;
-                        }
+                        returnAgent = queryagent;
+                        break;
                     }
                 }
             }
+
             return returnAgent;
         }
 
         private ScenePresence GetAnyPresenceFromAgentID(UUID AgentID)
         {
-            ScenePresence returnAgent = null;
+            List<Scene> scenes = null;
             lock (m_scenes)
+                scenes = new List<Scene>(m_scenes.Values);
+
+            ScenePresence returnAgent = null;
+            ScenePresence queryagent = null;
+            foreach (Scene scene in m_scenes.Values)
             {
-                ScenePresence queryagent = null;
-                foreach (Scene scene in m_scenes.Values)
+                queryagent = scene.GetScenePresence(AgentID);
+                if (queryagent != null)
                 {
-                    queryagent = scene.GetScenePresence(AgentID);
-                    if (queryagent != null)
-                    {
-                        returnAgent = queryagent;
-                        break;
-                    }
+                    returnAgent = queryagent;
+                    break;
                 }
             }
+ 
             return returnAgent;
         }
         
-- 
cgit v1.1