From 860b2a502f797e5822c6705d4639f370f3ac5861 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Thu, 16 Sep 2010 17:30:46 -0700
Subject: Changed SceneObjectGroup to store parts with the fast and thread-safe
 MapAndArray collection

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 838c648..8011154 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2051,9 +2051,7 @@ namespace OpenSim.Region.Framework.Scenes
                     sog.SetGroup(groupID, remoteClient);
                     sog.ScheduleGroupForFullUpdate();
 
-                    List<SceneObjectPart> partList = null;
-                    lock (sog.Children)
-                        partList = new List<SceneObjectPart>(sog.Children.Values);
+                    SceneObjectPart[] partList = sog.Parts;
                     
                     foreach (SceneObjectPart child in partList)
                         child.Inventory.ChangeInventoryOwner(ownerID);
@@ -2066,9 +2064,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if (sog.GroupID != groupID)
                         continue;
                     
-                    List<SceneObjectPart> partList = null;
-                    lock (sog.Children)
-                        partList = new List<SceneObjectPart>(sog.Children.Values);
+                    SceneObjectPart[] partList = sog.Parts;
 
                     foreach (SceneObjectPart child in partList)
                     {
-- 
cgit v1.1