diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 5 |
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 | |||
112 | if (failedAssetRestores > 0) | 112 | if (failedAssetRestores > 0) |
113 | m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores); | 113 | m_log.ErrorFormat("[ARCHIVER]: Failed to load {0} assets", failedAssetRestores); |
114 | 114 | ||
115 | m_log.Info("[ARCHIVER]: Clearing all existing scene objects"); | ||
116 | m_scene.DeleteAllSceneObjects(); | ||
117 | |||
115 | // Reload serialized prims | 118 | // Reload serialized prims |
116 | m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); | 119 | m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); |
117 | 120 | ||
@@ -122,6 +125,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
122 | { | 125 | { |
123 | SceneObjectGroup sceneObject = serialiser.LoadGroupFromXml2(m_scene, serialisedSceneObject); | 126 | SceneObjectGroup sceneObject = serialiser.LoadGroupFromXml2(m_scene, serialisedSceneObject); |
124 | 127 | ||
128 | // TODO: Change object creator/owner here | ||
129 | |||
125 | if (null != sceneObject) | 130 | if (null != sceneObject) |
126 | sceneObjects.Add(sceneObject); | 131 | sceneObjects.Add(sceneObject); |
127 | } | 132 | } |