aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-06-05 18:44:44 +0000
committerJustin Clarke Casey2009-06-05 18:44:44 +0000
commitc20f31beff0a8aa7961a87fddb6e723eb5cdd8e5 (patch)
treed6272fe530549a3cce4c37df6f6afdfbc36f0462 /OpenSim
parent* Fix unit tests so that they correctly handle 404 missing asset response (diff)
downloadopensim-SC-c20f31beff0a8aa7961a87fddb6e723eb5cdd8e5.zip
opensim-SC-c20f31beff0a8aa7961a87fddb6e723eb5cdd8e5.tar.gz
opensim-SC-c20f31beff0a8aa7961a87fddb6e723eb5cdd8e5.tar.bz2
opensim-SC-c20f31beff0a8aa7961a87fddb6e723eb5cdd8e5.tar.xz
* refactor: split out part xml writing in SceneObjectSerializer
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 0a01a14..5ae81cd 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
161 161
162 writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); 162 writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
163 writer.WriteStartElement(String.Empty, "RootPart", String.Empty); 163 writer.WriteStartElement(String.Empty, "RootPart", String.Empty);
164 sceneObject.RootPart.ToXml(writer); 164 ToOriginalXmlFormat(sceneObject.RootPart, writer);
165 writer.WriteEndElement(); 165 writer.WriteEndElement();
166 writer.WriteStartElement(String.Empty, "OtherParts", String.Empty); 166 writer.WriteStartElement(String.Empty, "OtherParts", String.Empty);
167 167
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
172 if (part.UUID != sceneObject.RootPart.UUID) 172 if (part.UUID != sceneObject.RootPart.UUID)
173 { 173 {
174 writer.WriteStartElement(String.Empty, "Part", String.Empty); 174 writer.WriteStartElement(String.Empty, "Part", String.Empty);
175 part.ToXml(writer); 175 ToOriginalXmlFormat(part, writer);
176 writer.WriteEndElement(); 176 writer.WriteEndElement();
177 } 177 }
178 } 178 }
@@ -184,6 +184,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
184 184
185 //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", Name, System.Environment.TickCount - time); 185 //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", Name, System.Environment.TickCount - time);
186 } 186 }
187
188 protected static void ToOriginalXmlFormat(SceneObjectPart part, XmlTextWriter writer)
189 {
190 part.ToXml(writer);
191 }
187 192
188 public static SceneObjectGroup FromXml2Format(string xmlData) 193 public static SceneObjectGroup FromXml2Format(string xmlData)
189 { 194 {