* For now, when loading an archive all the existing scene objects get deleted by default

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 40c7a69..fbda830 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -112,6 +112,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             if (failedAssetRestores > 0)
                 m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores);
 
+            m_log.Info("[ARCHIVER]: Clearing all existing scene objects");            
+            m_scene.DeleteAllSceneObjects();
+            
             // Reload serialized prims
             m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
 
@@ -122,6 +125,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             {             
                 SceneObjectGroup sceneObject = serialiser.LoadGroupFromXml2(m_scene, serialisedSceneObject);
                 
+                // TODO: Change object creator/owner here
+                
                 if (null != sceneObject)
                     sceneObjects.Add(sceneObject);
             }