diff options
author | Diva Canto | 2010-10-14 09:05:46 -0700 |
---|---|---|
committer | Diva Canto | 2010-10-14 09:05:46 -0700 |
commit | 41ce392d9b32c343c5239b3a9fa0ef9f83b6a96f (patch) | |
tree | 622c3cdf14c08510a949938f25fa0e8bf77b9d33 /OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC-41ce392d9b32c343c5239b3a9fa0ef9f83b6a96f.zip opensim-SC-41ce392d9b32c343c5239b3a9fa0ef9f83b6a96f.tar.gz opensim-SC-41ce392d9b32c343c5239b3a9fa0ef9f83b6a96f.tar.bz2 opensim-SC-41ce392d9b32c343c5239b3a9fa0ef9f83b6a96f.tar.xz |
Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems to be generating xml's that are successfully parsed. Needs more testing.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index bb67ca0..c6d4e55 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
@@ -280,6 +280,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
280 | 280 | ||
281 | public static void SavePrimListToXml2(EntityBase[] entityList, TextWriter stream, Vector3 min, Vector3 max) | 281 | public static void SavePrimListToXml2(EntityBase[] entityList, TextWriter stream, Vector3 min, Vector3 max) |
282 | { | 282 | { |
283 | XmlTextWriter writer = new XmlTextWriter(stream); | ||
284 | |||
283 | int primCount = 0; | 285 | int primCount = 0; |
284 | stream.WriteLine("<scene>\n"); | 286 | stream.WriteLine("<scene>\n"); |
285 | 287 | ||
@@ -297,10 +299,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
297 | continue; | 299 | continue; |
298 | } | 300 | } |
299 | 301 | ||
300 | stream.WriteLine(SceneObjectSerializer.ToXml2Format(g)); | 302 | //stream.WriteLine(SceneObjectSerializer.ToXml2Format(g)); |
303 | SceneObjectSerializer.SOGToXml2(writer, (SceneObjectGroup)ent); | ||
304 | stream.WriteLine(); | ||
305 | |||
301 | primCount++; | 306 | primCount++; |
302 | } | 307 | } |
303 | } | 308 | } |
309 | |||
304 | stream.WriteLine("</scene>\n"); | 310 | stream.WriteLine("</scene>\n"); |
305 | stream.Flush(); | 311 | stream.Flush(); |
306 | } | 312 | } |