diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 1 |
2 files changed, 16 insertions, 0 deletions
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; | |||
31 | using System; | 31 | using System; |
32 | using System.IO; | 32 | using System.IO; |
33 | using System.Reflection; | 33 | using System.Reflection; |
34 | using System.Xml; | ||
34 | using libsecondlife; | 35 | using libsecondlife; |
35 | using log4net; | 36 | using log4net; |
36 | 37 | ||
@@ -101,6 +102,20 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
101 | m_log.InfoFormat("[ARCHIVER]: Loading prim data"); | 102 | m_log.InfoFormat("[ARCHIVER]: Loading prim data"); |
102 | 103 | ||
103 | IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>(); | 104 | IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>(); |
105 | |||
106 | // Temporary code to read each sog in the file separately, pending actually having these in separate files | ||
107 | // XmlTextReader xtr = new XmlTextReader(new StringReader(serializedPrims)); | ||
108 | // XmlDocument doc = new XmlDocument(); | ||
109 | // reader.WhitespaceHandling = WhitespaceHandling.None; | ||
110 | // doc.Load(xtr); | ||
111 | // xtr.Close(); | ||
112 | // XmlNode sceneNode = doc.FirstChild; | ||
113 | // | ||
114 | // foreach (XmlNode objectNode in sceneNode.ChildNodes) | ||
115 | // { | ||
116 | // CreatePrimFromXml2(m_scene, objectNode.OuterXml); | ||
117 | // } | ||
118 | |||
104 | serialiser.LoadPrimsFromXml2(m_scene, new StringReader(serializedPrims)); | 119 | serialiser.LoadPrimsFromXml2(m_scene, new StringReader(serializedPrims)); |
105 | } | 120 | } |
106 | } | 121 | } |
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs index db16601..94161f0 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | |||
@@ -114,6 +114,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
114 | doc.Load(reader); | 114 | doc.Load(reader); |
115 | reader.Close(); | 115 | reader.Close(); |
116 | rootNode = doc.FirstChild; | 116 | rootNode = doc.FirstChild; |
117 | |||
117 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) | 118 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) |
118 | { | 119 | { |
119 | CreatePrimFromXml2(scene, aPrimNode.OuterXml); | 120 | CreatePrimFromXml2(scene, aPrimNode.OuterXml); |