diff options
author | Justin Clarke Casey | 2008-06-21 21:20:59 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-21 21:20:59 +0000 |
commit | 908d91be78038832945eec5c4d05c71ab64e3680 (patch) | |
tree | d7274271c36fa557c0b22833e614e2e122922d6c /OpenSim/Region/Environment/Modules/World/Archiver | |
parent | * Remove redundant <scene> tag from individual object xml representation (diff) | |
download | opensim-SC_OLD-908d91be78038832945eec5c4d05c71ab64e3680.zip opensim-SC_OLD-908d91be78038832945eec5c4d05c71ab64e3680.tar.gz opensim-SC_OLD-908d91be78038832945eec5c4d05c71ab64e3680.tar.bz2 opensim-SC_OLD-908d91be78038832945eec5c4d05c71ab64e3680.tar.xz |
* refactor: Making some of the serialization names consistent, both within their pairings and with the others
* This does make some of the names less ideal than others - this should change in the future
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs index d2b8018..26fc1a6 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -99,24 +99,28 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
99 | } | 99 | } |
100 | 100 | ||
101 | // Reload serialized prims | 101 | // Reload serialized prims |
102 | m_log.InfoFormat("[ARCHIVER]: Loading prim data"); | 102 | m_log.InfoFormat("[ARCHIVER]: Loading scene objects"); |
103 | 103 | ||
104 | IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>(); | 104 | IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>(); |
105 | 105 | ||
106 | // Temporary code to read each sog in the file separately, pending actually having these in separate files | 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)); | 107 | XmlTextReader xtr = new XmlTextReader(new StringReader(serializedPrims)); |
108 | // XmlDocument doc = new XmlDocument(); | 108 | XmlDocument doc = new XmlDocument(); |
109 | // reader.WhitespaceHandling = WhitespaceHandling.None; | 109 | xtr.WhitespaceHandling = WhitespaceHandling.None; |
110 | // doc.Load(xtr); | 110 | doc.Load(xtr); |
111 | // xtr.Close(); | 111 | xtr.Close(); |
112 | // XmlNode sceneNode = doc.FirstChild; | 112 | XmlNode sceneNode = doc.FirstChild; |
113 | // | 113 | int count = 0; |
114 | // foreach (XmlNode objectNode in sceneNode.ChildNodes) | 114 | |
115 | // { | 115 | foreach (XmlNode objectNode in sceneNode.ChildNodes) |
116 | // CreatePrimFromXml2(m_scene, objectNode.OuterXml); | 116 | { |
117 | // } | 117 | serialiser.LoadGroupFromXml2(m_scene, objectNode.OuterXml.ToString()); |
118 | count++; | ||
119 | } | ||
120 | |||
121 | //serialiser.LoadPrimsFromXml2(m_scene, new StringReader(serializedPrims)); | ||
118 | 122 | ||
119 | serialiser.LoadPrimsFromXml2(m_scene, new StringReader(serializedPrims)); | 123 | m_log.DebugFormat("[ARCHIVER]: Loaded {0} scene objects", count); |
120 | } | 124 | } |
121 | } | 125 | } |
122 | } | 126 | } |