1 files changed, 29 insertions, 26 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index bc653ce..1623e6e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -243,36 +243,39 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // to the same scene (when this is possible).
                 sceneObject.ResetIDs();
 
-                foreach (SceneObjectPart part in sceneObject.Children.Values)
+                lock (sceneObject.Children)
                 {
-                    if (!ResolveUserUuid(part.CreatorID))
-                        part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
-
-                    if (!ResolveUserUuid(part.OwnerID))
-                        part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
-
-                    if (!ResolveUserUuid(part.LastOwnerID))
-                        part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
-
-                    // And zap any troublesome sit target information
-                    part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
-                    part.SitTargetPosition    = new Vector3(0, 0, 0);
-
-                    // Fix ownership/creator of inventory items
-                    // Not doing so results in inventory items
-                    // being no copy/no mod for everyone
-                    lock (part.TaskInventory)
+                    foreach (SceneObjectPart part in sceneObject.Children.Values)
                     {
-                        TaskInventoryDictionary inv = part.TaskInventory;
-                        foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
+                        if (!ResolveUserUuid(part.CreatorID))
+                            part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        if (!ResolveUserUuid(part.OwnerID))
+                            part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        if (!ResolveUserUuid(part.LastOwnerID))
+                            part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+    
+                        // And zap any troublesome sit target information
+                        part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
+                        part.SitTargetPosition    = new Vector3(0, 0, 0);
+    
+                        // Fix ownership/creator of inventory items
+                        // Not doing so results in inventory items
+                        // being no copy/no mod for everyone
+                        lock (part.TaskInventory)
                         {
-                            if (!ResolveUserUuid(kvp.Value.OwnerID))
-                            {
-                                kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
-                            }
-                            if (!ResolveUserUuid(kvp.Value.CreatorID))
+                            TaskInventoryDictionary inv = part.TaskInventory;
+                            foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                             {
-                                kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                                if (!ResolveUserUuid(kvp.Value.OwnerID))
+                                {
+                                    kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                                }
+                                if (!ResolveUserUuid(kvp.Value.CreatorID))
+                                {
+                                    kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                                }
                             }
                         }
                     }