diff options
author | Diva Canto | 2010-10-17 10:41:38 -0700 |
---|---|---|
committer | Diva Canto | 2010-10-17 10:41:38 -0700 |
commit | 7038f2b40634a3f17259be52ff67a887e003cb05 (patch) | |
tree | 05c1bfdc6bd78d3bcd117194101dd8983256a0c5 /OpenSim/Region/Framework/Scenes/Serialization | |
parent | .NET automagical serialization of SOPs replaced by manual serialization acros... (diff) | |
download | opensim-SC_OLD-7038f2b40634a3f17259be52ff67a887e003cb05.zip opensim-SC_OLD-7038f2b40634a3f17259be52ff67a887e003cb05.tar.gz opensim-SC_OLD-7038f2b40634a3f17259be52ff67a887e003cb05.tar.bz2 opensim-SC_OLD-7038f2b40634a3f17259be52ff67a887e003cb05.tar.xz |
Deleted all [XmlIgnore] from SOP, since those are meaningless now.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 4897cd6..252304b 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
149 | 149 | ||
150 | writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); | 150 | writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); |
151 | writer.WriteStartElement(String.Empty, "RootPart", String.Empty); | 151 | writer.WriteStartElement(String.Empty, "RootPart", String.Empty); |
152 | ToOriginalXmlFormat(sceneObject.RootPart, writer); | 152 | ToXmlFormat(sceneObject.RootPart, writer); |
153 | writer.WriteEndElement(); | 153 | writer.WriteEndElement(); |
154 | writer.WriteStartElement(String.Empty, "OtherParts", String.Empty); | 154 | writer.WriteStartElement(String.Empty, "OtherParts", String.Empty); |
155 | 155 | ||
@@ -160,7 +160,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
160 | if (part.UUID != sceneObject.RootPart.UUID) | 160 | if (part.UUID != sceneObject.RootPart.UUID) |
161 | { | 161 | { |
162 | writer.WriteStartElement(String.Empty, "Part", String.Empty); | 162 | writer.WriteStartElement(String.Empty, "Part", String.Empty); |
163 | ToOriginalXmlFormat(part, writer); | 163 | ToXmlFormat(part, writer); |
164 | writer.WriteEndElement(); | 164 | writer.WriteEndElement(); |
165 | } | 165 | } |
166 | } | 166 | } |
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
172 | //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", Name, System.Environment.TickCount - time); | 172 | //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", Name, System.Environment.TickCount - time); |
173 | } | 173 | } |
174 | 174 | ||
175 | protected static void ToOriginalXmlFormat(SceneObjectPart part, XmlTextWriter writer) | 175 | protected static void ToXmlFormat(SceneObjectPart part, XmlTextWriter writer) |
176 | { | 176 | { |
177 | SOPToXml2(writer, part, new Dictionary<string, object>()); | 177 | SOPToXml2(writer, part, new Dictionary<string, object>()); |
178 | } | 178 | } |