From 8acac3d07f63769051d5aad9a54953d033210f48 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 19 Oct 2010 15:07:15 -0700
Subject: Another take related to the previous commit.
---
.../Scenes/Serialization/SceneObjectSerializer.cs | 30 ++++++++++++----------
1 file changed, 17 insertions(+), 13 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 3a48299..58ec8a6 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1435,22 +1435,26 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
static Quaternion ReadQuaternion(XmlTextReader reader, string name)
{
- Quaternion quat;
+ Quaternion quat = new Quaternion();
reader.ReadStartElement(name);
- if (reader.Name == "X") // assume X, Y, Z, W order
- {
- quat.X = reader.ReadElementContentAsFloat("X", String.Empty);
- quat.Y = reader.ReadElementContentAsFloat("Y", String.Empty);
- quat.Z = reader.ReadElementContentAsFloat("Z", String.Empty);
- quat.W = reader.ReadElementContentAsFloat("W", String.Empty);
- }
- else // assume w, x, y, z
+ while (reader.NodeType != XmlNodeType.EndElement)
{
- quat.W = reader.ReadElementContentAsFloat("w", String.Empty);
- quat.X = reader.ReadElementContentAsFloat("x", String.Empty);
- quat.Y = reader.ReadElementContentAsFloat("y", String.Empty);
- quat.Z = reader.ReadElementContentAsFloat("z", String.Empty);
+ switch (reader.Name.ToLower())
+ {
+ case "x":
+ quat.X = reader.ReadElementContentAsFloat(reader.Name, String.Empty);
+ break;
+ case "y":
+ quat.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty);
+ break;
+ case "z":
+ quat.Z = reader.ReadElementContentAsFloat(reader.Name, String.Empty);
+ break;
+ case "w":
+ quat.W = reader.ReadElementContentAsFloat(reader.Name, String.Empty);
+ break;
+ }
}
reader.ReadEndElement();
--
cgit v1.1