* Give new uuids to all the objects loaded in from an archive.

* This should allow multiple copies of an archive to be loaded into different regions on the same region server
* This shouldn't affect existing operations.

2 files changed, 9 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index a26a1c7..1e38cd6 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -123,18 +123,18 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             {             
                 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
                 
+                // For now, give all incoming scene objects new uuids.  This will allow scenes to be cloned
+                // on the same region server and multiple examples a single object archive to be imported
+                // to the same scene (when this is possible).
+                sceneObject.ResetIDs();
+                
                 // Make the master the owner/creator of everything imported for now
                 LLUUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
                 foreach (SceneObjectPart part in sceneObject.Children.Values)
                 {
                     part.CreatorID = masterAvatarId;
                     part.OwnerID = masterAvatarId;
-                    part.LastOwnerID = masterAvatarId;
-                    
-                    // For now, give all incoming scene objects new uuids.  This will allow scenes to be cloned
-                    // on the same region server and multiple examples a single object archive to be imported
-                    // to the same scene (when this is possible).
-                    //part.UUID = LLUUID.Random();
+                    part.LastOwnerID = masterAvatarId;                    
                 }                 
                 
                 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5ab7731..0cf2016 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2047,7 +2047,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="vel"></param>
         /// <param name="param"></param>
         /// <returns></returns>
-        public virtual SceneObjectGroup RezObject(SceneObjectPart sourcePart, TaskInventoryItem item, LLVector3 pos, LLQuaternion rot, LLVector3 vel, int param)
+        public virtual SceneObjectGroup RezObject(
+            SceneObjectPart sourcePart, TaskInventoryItem item, 
+            LLVector3 pos, LLQuaternion rot, LLVector3 vel, int param)
         {
             // Rez object
             if (item != null)