From 9618c196c274fefda4437eff6d25c7a12e7a3ee1 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 7 Oct 2009 01:44:36 +0100
Subject: Revert "Merging in diva's locking fixes"

This reverts commit 832cc685138b2244529f10b54b373c34adb4a633.
---
 .../Avatar/Inventory/Transfer/InventoryTransferModule.cs  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index e6e0483..d9a021f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -111,17 +111,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
         private Scene FindClientScene(UUID agentId)
         {
-            List<Scene> scenes = null;
             lock (m_Scenelist)
-                scenes = new List<Scene>(m_Scenelist);
-
-            foreach (Scene scene in scenes)
             {
-                ScenePresence presence = scene.GetScenePresence(agentId);
-                if (presence != null)
+                foreach (Scene scene in m_Scenelist)
                 {
-                    if (!presence.IsChildAgent)
-                        return scene;
+                    ScenePresence presence = scene.GetScenePresence(agentId);
+                    if (presence != null)
+                    {
+                        if (!presence.IsChildAgent)
+                            return scene;
+                    }
                 }
             }
             return null;
-- 
cgit v1.1