Merge branch 'master' into careminster-presence-refactor

1 files changed, 21 insertions, 1 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index a402f4f..e51f118 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -243,9 +243,29 @@ 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.Children.Values)
+                    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(part.CreatorID))
                             part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;