aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-08 19:18:37 +0000
committerJustin Clarke Casey2009-05-08 19:18:37 +0000
commit567e0d032c56b2d1498216416fa6874ec77dd55b (patch)
treeef63642c32a558c1a47f4fd9143fdbdf25d1e5f3 /OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
parentImplement an ingenious solution to pacekt pool performance suggested by (diff)
downloadopensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.zip
opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.gz
opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.bz2
opensim-SC_OLD-567e0d032c56b2d1498216416fa6874ec77dd55b.tar.xz
* break out 'xml2' deserialization from sog
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
index 212ca72..49fe8a4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
@@ -125,14 +125,14 @@ namespace OpenSim.Region.Framework.Scenes
125 foreach (XmlNode aPrimNode in rootNode.ChildNodes) 125 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
126 { 126 {
127 // There is only ever one prim. This oddity should be removeable post 0.5.9 127 // There is only ever one prim. This oddity should be removeable post 0.5.9
128 return new SceneObjectGroup(aPrimNode.OuterXml); 128 return SceneObjectSerializer.FromXml2Format(aPrimNode.OuterXml);
129 } 129 }
130 130
131 return null; 131 return null;
132 } 132 }
133 else 133 else
134 { 134 {
135 return new SceneObjectGroup(rootNode.OuterXml); 135 return SceneObjectSerializer.FromXml2Format(rootNode.OuterXml);
136 } 136 }
137 } 137 }
138 138
@@ -193,7 +193,7 @@ namespace OpenSim.Region.Framework.Scenes
193 /// <returns>The scene object created. null if the scene object already existed</returns> 193 /// <returns>The scene object created. null if the scene object already existed</returns>
194 protected static SceneObjectGroup CreatePrimFromXml2(Scene scene, string xmlData) 194 protected static SceneObjectGroup CreatePrimFromXml2(Scene scene, string xmlData)
195 { 195 {
196 SceneObjectGroup obj = new SceneObjectGroup(xmlData); 196 SceneObjectGroup obj = SceneObjectSerializer.FromXml2Format(xmlData);
197 197
198 if (scene.AddRestoredSceneObject(obj, true, false)) 198 if (scene.AddRestoredSceneObject(obj, true, false))
199 return obj; 199 return obj;