diff options
author | Justin Clarke Casey | 2009-05-08 15:47:59 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-08 15:47:59 +0000 |
commit | 032e3b49eb4f669ffb74a0209aefafcc86f4f6c7 (patch) | |
tree | d275e8445ac33074727e2b0adbc5582b7cbc1aba /OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs | |
parent | * Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStr... (diff) | |
download | opensim-SC_OLD-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.zip opensim-SC_OLD-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.gz opensim-SC_OLD-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.bz2 opensim-SC_OLD-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.xz |
* refactor: Break out original xml object serialization into a separate class
* No functional change
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs index 7d9d247..1a4efe7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs | |||
@@ -33,6 +33,7 @@ using System.Xml; | |||
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
36 | using OpenSim.Region.Physics.Manager; | 37 | using OpenSim.Region.Physics.Manager; |
37 | 38 | ||
38 | namespace OpenSim.Region.Framework.Scenes | 39 | namespace OpenSim.Region.Framework.Scenes |
@@ -58,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
58 | rootNode = doc.FirstChild; | 59 | rootNode = doc.FirstChild; |
59 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) | 60 | foreach (XmlNode aPrimNode in rootNode.ChildNodes) |
60 | { | 61 | { |
61 | SceneObjectGroup obj = new SceneObjectGroup(aPrimNode.OuterXml, true); | 62 | SceneObjectGroup obj = SceneObjectSerializer.DeserializeOriginalXmlFormat(aPrimNode.OuterXml); |
62 | 63 | ||
63 | if (newIDS) | 64 | if (newIDS) |
64 | { | 65 | { |