diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index fe74158..f7544ac 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -122,13 +122,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
122 | "[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); | 122 | "[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); |
123 | return null; | 123 | return null; |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | /// <summary> | 127 | /// <summary> |
128 | /// Serialize a scene object to the original xml format | 128 | /// Serialize a scene object to the original xml format |
129 | /// </summary> | 129 | /// </summary> |
130 | /// <param name="sceneObject"></param> | 130 | /// <param name="sceneObject"></param> |
131 | /// <returns></returns> | 131 | /// <returns></returns> |
132 | public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject) | 132 | public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject) |
133 | { | 133 | { |
134 | using (StringWriter sw = new StringWriter()) | 134 | using (StringWriter sw = new StringWriter()) |
@@ -140,13 +140,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
140 | 140 | ||
141 | return sw.ToString(); | 141 | return sw.ToString(); |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | /// <summary> | 145 | /// <summary> |
146 | /// Serialize a scene object to the original xml format | 146 | /// Serialize a scene object to the original xml format |
147 | /// </summary> | 147 | /// </summary> |
148 | /// <param name="sceneObject"></param> | 148 | /// <param name="sceneObject"></param> |
149 | /// <returns></returns> | 149 | /// <returns></returns> |
150 | public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer) | 150 | public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer) |
151 | { | 151 | { |
152 | //m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name); | 152 | //m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name); |
@@ -238,13 +238,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
238 | m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); | 238 | m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); |
239 | return null; | 239 | return null; |
240 | } | 240 | } |
241 | } | 241 | } |
242 | 242 | ||
243 | /// <summary> | 243 | /// <summary> |
244 | /// Serialize a scene object to the 'xml2' format. | 244 | /// Serialize a scene object to the 'xml2' format. |
245 | /// </summary> | 245 | /// </summary> |
246 | /// <param name="sceneObject"></param> | 246 | /// <param name="sceneObject"></param> |
247 | /// <returns></returns> | 247 | /// <returns></returns> |
248 | public static string ToXml2Format(SceneObjectGroup sceneObject) | 248 | public static string ToXml2Format(SceneObjectGroup sceneObject) |
249 | { | 249 | { |
250 | using (StringWriter sw = new StringWriter()) | 250 | using (StringWriter sw = new StringWriter()) |
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
262 | /// Serialize a scene object to the 'xml2' format. | 262 | /// Serialize a scene object to the 'xml2' format. |
263 | /// </summary> | 263 | /// </summary> |
264 | /// <param name="sceneObject"></param> | 264 | /// <param name="sceneObject"></param> |
265 | /// <returns></returns> | 265 | /// <returns></returns> |
266 | public static void ToXml2Format(SceneObjectGroup sceneObject, XmlTextWriter writer) | 266 | public static void ToXml2Format(SceneObjectGroup sceneObject, XmlTextWriter writer) |
267 | { | 267 | { |
268 | //m_log.DebugFormat("[SERIALIZER]: Starting serialization of SOG {0} to XML2", Name); | 268 | //m_log.DebugFormat("[SERIALIZER]: Starting serialization of SOG {0} to XML2", Name); |
@@ -288,6 +288,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
288 | writer.WriteEndElement(); // End of SceneObjectGroup | 288 | writer.WriteEndElement(); // End of SceneObjectGroup |
289 | 289 | ||
290 | //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time); | 290 | //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time); |
291 | } | 291 | } |
292 | } | 292 | } |
293 | } | 293 | } |