From 0f1604a53f8ee74073effffae9f1220acc067f84 Mon Sep 17 00:00:00 2001 From: MW Date: Tue, 16 Oct 2007 11:16:25 +0000 Subject: Couple of small changes to Xml serialising of SceneObjectGroups (shouldn't effect anything). --- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 8 ++++---- OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 6a2f105..f1930ea 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -271,18 +271,18 @@ namespace OpenSim.Region.Environment.Scenes XmlTextReader reader = new XmlTextReader(sr); reader.Read(); reader.ReadStartElement("SceneObjectGroup"); - reader.ReadStartElement("RootPart"); + // reader.ReadStartElement("RootPart"); m_rootPart = SceneObjectPart.FromXml(reader); - reader.ReadEndElement(); + //reader.ReadEndElement(); while (reader.Read()) { switch (reader.NodeType) { case XmlNodeType.Element: - if (reader.Name == "Part") + if (reader.Name == "SceneObjectPart") { - reader.Read(); + // reader.Read(); SceneObjectPart Part = SceneObjectPart.FromXml(reader); AddPart(Part); } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 7161183..58d2157 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -69,7 +69,9 @@ namespace OpenSim.Region.Environment.Scenes protected byte[] m_particleSystem = new byte[0]; + [XmlIgnore] public uint TimeStampFull = 0; + [XmlIgnore] public uint TimeStampTerse = 0; protected SceneObjectGroup m_parentGroup; -- cgit v1.1