ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-07-14 16:23:59 +00:00
parent 31e5d348f6
commit 9cb4ba9d6b
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
View File

@@ -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);
}