diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 0b7379b..b8d210c 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
107 | part.LinkNum = linkNum; | 107 | part.LinkNum = linkNum; |
108 | part.TrimPermissions(); | 108 | part.TrimPermissions(); |
109 | } | 109 | } |
110 | } | 110 | } |
111 | while (reader.ReadToNextSibling("Part")); | 111 | while (reader.ReadToNextSibling("Part")); |
112 | } | 112 | } |
113 | 113 | ||
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
156 | { | 156 | { |
157 | ToOriginalXmlFormat(sceneObject, writer, doScriptStates, false); | 157 | ToOriginalXmlFormat(sceneObject, writer, doScriptStates, false); |
158 | } | 158 | } |
159 | 159 | ||
160 | public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject, string scriptedState) | 160 | public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject, string scriptedState) |
161 | { | 161 | { |
162 | using (StringWriter sw = new StringWriter()) | 162 | using (StringWriter sw = new StringWriter()) |
@@ -190,7 +190,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
190 | 190 | ||
191 | if (!noRootElement) | 191 | if (!noRootElement) |
192 | writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); | 192 | writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); |
193 | 193 | ||
194 | writer.WriteStartElement(String.Empty, "RootPart", String.Empty); | 194 | writer.WriteStartElement(String.Empty, "RootPart", String.Empty); |
195 | ToXmlFormat(sceneObject.RootPart, writer); | 195 | ToXmlFormat(sceneObject.RootPart, writer); |
196 | writer.WriteEndElement(); | 196 | writer.WriteEndElement(); |
@@ -212,23 +212,23 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
212 | 212 | ||
213 | if (doScriptStates) | 213 | if (doScriptStates) |
214 | sceneObject.SaveScriptedState(writer); | 214 | sceneObject.SaveScriptedState(writer); |
215 | 215 | ||
216 | if (!noRootElement) | 216 | if (!noRootElement) |
217 | writer.WriteEndElement(); // SceneObjectGroup | 217 | writer.WriteEndElement(); // SceneObjectGroup |
218 | 218 | ||
219 | // m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", sceneObject.Name, System.Environment.TickCount - time); | 219 | // m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", sceneObject.Name, System.Environment.TickCount - time); |
220 | } | 220 | } |
221 | 221 | ||
222 | protected static void ToXmlFormat(SceneObjectPart part, XmlTextWriter writer) | 222 | protected static void ToXmlFormat(SceneObjectPart part, XmlTextWriter writer) |
223 | { | 223 | { |
224 | SOPToXml2(writer, part, new Dictionary<string, object>()); | 224 | SOPToXml2(writer, part, new Dictionary<string, object>()); |
225 | } | 225 | } |
226 | 226 | ||
227 | public static SceneObjectGroup FromXml2Format(string xmlData) | 227 | public static SceneObjectGroup FromXml2Format(string xmlData) |
228 | { | 228 | { |
229 | //m_log.DebugFormat("[SOG]: Starting deserialization of SOG"); | 229 | //m_log.DebugFormat("[SOG]: Starting deserialization of SOG"); |
230 | //int time = System.Environment.TickCount; | 230 | //int time = System.Environment.TickCount; |
231 | 231 | ||
232 | try | 232 | try |
233 | { | 233 | { |
234 | XmlDocument doc = new XmlDocument(); | 234 | XmlDocument doc = new XmlDocument(); |
@@ -780,7 +780,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
780 | obj.VehicleParams = vehicle; | 780 | obj.VehicleParams = vehicle; |
781 | } | 781 | } |
782 | } | 782 | } |
783 | 783 | ||
784 | private static void ProcessShape(SceneObjectPart obj, XmlReader reader) | 784 | private static void ProcessShape(SceneObjectPart obj, XmlReader reader) |
785 | { | 785 | { |
786 | List<string> errorNodeNames; | 786 | List<string> errorNodeNames; |
@@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1235 | { | 1235 | { |
1236 | shp.HollowShape = Util.ReadEnum<HollowShape>(reader, "HollowShape"); | 1236 | shp.HollowShape = Util.ReadEnum<HollowShape>(reader, "HollowShape"); |
1237 | } | 1237 | } |
1238 | 1238 | ||
1239 | private static void ProcessShpSculptTexture(PrimitiveBaseShape shp, XmlReader reader) | 1239 | private static void ProcessShpSculptTexture(PrimitiveBaseShape shp, XmlReader reader) |
1240 | { | 1240 | { |
1241 | shp.SculptTexture = Util.ReadUUID(reader, "SculptTexture"); | 1241 | shp.SculptTexture = Util.ReadUUID(reader, "SculptTexture"); |
@@ -1367,13 +1367,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1367 | 1367 | ||
1368 | if (sog.RootPart.KeyframeMotion != null) | 1368 | if (sog.RootPart.KeyframeMotion != null) |
1369 | { | 1369 | { |
1370 | Byte[] data = sog.RootPart.KeyframeMotion.Serialize(); | 1370 | Byte[] data = sog.RootPart.KeyframeMotion.Serialize(); |
1371 | 1371 | ||
1372 | writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty); | 1372 | writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty); |
1373 | writer.WriteBase64(data, 0, data.Length); | 1373 | writer.WriteBase64(data, 0, data.Length); |
1374 | writer.WriteEndElement(); | 1374 | writer.WriteEndElement(); |
1375 | } | 1375 | } |
1376 | 1376 | ||
1377 | 1377 | ||
1378 | writer.WriteEndElement(); | 1378 | writer.WriteEndElement(); |
1379 | } | 1379 | } |
@@ -1438,7 +1438,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1438 | WriteShape(writer, sop.Shape, options); | 1438 | WriteShape(writer, sop.Shape, options); |
1439 | 1439 | ||
1440 | WriteVector(writer, "Scale", sop.Scale); | 1440 | WriteVector(writer, "Scale", sop.Scale); |
1441 | WriteQuaternion(writer, "SitTargetOrientation", sop.SitTargetOrientation); | 1441 | WriteQuaternion(writer, "SitTargetOrientation", sop.SitTargetOrientation); |
1442 | WriteVector(writer, "SitTargetPosition", sop.SitTargetPosition); | 1442 | WriteVector(writer, "SitTargetPosition", sop.SitTargetPosition); |
1443 | WriteVector(writer, "SitTargetPositionLL", sop.SitTargetPositionLL); | 1443 | WriteVector(writer, "SitTargetPositionLL", sop.SitTargetPositionLL); |
1444 | WriteQuaternion(writer, "SitTargetOrientationLL", sop.SitTargetOrientationLL); | 1444 | WriteQuaternion(writer, "SitTargetOrientationLL", sop.SitTargetOrientationLL); |
@@ -1472,7 +1472,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1472 | if (sop.MediaUrl != null) | 1472 | if (sop.MediaUrl != null) |
1473 | writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString()); | 1473 | writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString()); |
1474 | WriteVector(writer, "AttachedPos", sop.AttachedPos); | 1474 | WriteVector(writer, "AttachedPos", sop.AttachedPos); |
1475 | 1475 | ||
1476 | if (sop.DynAttrs.CountNamespaces > 0) | 1476 | if (sop.DynAttrs.CountNamespaces > 0) |
1477 | { | 1477 | { |
1478 | writer.WriteStartElement("DynAttrs"); | 1478 | writer.WriteStartElement("DynAttrs"); |
@@ -1520,7 +1520,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1520 | writer.WriteElementString("SoundRadius", sop.SoundRadius.ToString().ToLower()); | 1520 | writer.WriteElementString("SoundRadius", sop.SoundRadius.ToString().ToLower()); |
1521 | } | 1521 | } |
1522 | writer.WriteElementString("SoundQueueing", sop.SoundQueueing.ToString().ToLower()); | 1522 | writer.WriteElementString("SoundQueueing", sop.SoundQueueing.ToString().ToLower()); |
1523 | 1523 | ||
1524 | writer.WriteEndElement(); | 1524 | writer.WriteEndElement(); |
1525 | } | 1525 | } |
1526 | 1526 | ||