Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection

3 files changed, 3 insertions, 16 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 1fba6c2..6b538f6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -243,11 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // to the same scene (when this is possible).
                 sceneObject.ResetIDs();
 
-                List<SceneObjectPart> partList = null;
-                lock (sceneObject.Children)
-                    partList = new List<SceneObjectPart>(sceneObject.Children.Values);
-                
-                foreach (SceneObjectPart part in partList)
+                foreach (SceneObjectPart part in sceneObject.Parts)
                 {
                     if (!ResolveUserUuid(part.CreatorID))
                         part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index db50339..d91c36c 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -128,14 +128,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
                 group.SetOwnerId(remoteClient.AgentId);
                 group.SetRootPartOwner(part, remoteClient.AgentId, remoteClient.ActiveGroupId);
 
-                List<SceneObjectPart> partList = null;
-                
-                lock (group.Children)
-                    partList = new List<SceneObjectPart>(group.Children.Values);
-
                 if (m_scene.Permissions.PropagatePermissions())
                 {
-                    foreach (SceneObjectPart child in partList)
+                    foreach (SceneObjectPart child in group.Parts)
                     {
                         child.Inventory.ChangeInventoryOwner(remoteClient.AgentId);
                         child.TriggerScriptChangedEvent(Changed.OWNER);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index 1bd1371..c83ac85 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -229,11 +229,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         Color mapdotspot = Color.Gray; // Default color when prim color is white
                         
                         // Loop over prim in group
-                        List<SceneObjectPart> partList = null;
-                        lock (mapdot.Children)
-                            partList = new List<SceneObjectPart>(mapdot.Children.Values);
-                            
-                        foreach (SceneObjectPart part in partList)
+                        foreach (SceneObjectPart part in mapdot.Parts)
                         {
                             if (part == null)
                                 continue;