From b290ce405f01ae4b52ba5d5ec1661a2ae44ba2d6 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Sat, 21 Jun 2008 19:56:19 +0000 Subject: * Remove a bug I created in r5171 where taking an object would terminate the client session * change code to use an explicit state variable instead of using SOG.Name = null to signal deletion --- .../Modules/World/Archiver/ArchiveReadRequest.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'OpenSim/Region/Environment/Modules/World/Archiver') diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index 6e53f28..d2b8018 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs @@ -31,6 +31,7 @@ using OpenSim.Region.Environment.Modules.World.Serialiser; using System; using System.IO; using System.Reflection; +using System.Xml; using libsecondlife; using log4net; @@ -101,6 +102,20 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver m_log.InfoFormat("[ARCHIVER]: Loading prim data"); IRegionSerialiser serialiser = m_scene.RequestModuleInterface(); + + // Temporary code to read each sog in the file separately, pending actually having these in separate files +// XmlTextReader xtr = new XmlTextReader(new StringReader(serializedPrims)); +// XmlDocument doc = new XmlDocument(); +// reader.WhitespaceHandling = WhitespaceHandling.None; +// doc.Load(xtr); +// xtr.Close(); +// XmlNode sceneNode = doc.FirstChild; +// +// foreach (XmlNode objectNode in sceneNode.ChildNodes) +// { +// CreatePrimFromXml2(m_scene, objectNode.OuterXml); +// } + serialiser.LoadPrimsFromXml2(m_scene, new StringReader(serializedPrims)); } } -- cgit v1.1