From 3b2d9a99390e44d99bf00a6be685c08e307b9e42 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 19 Oct 2010 14:37:03 -0700 Subject: Added code to quaternion deserialization to try to cope with an exception seen in Wright Plaza related to SitTargetOrientation. 17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064. --- .../Scenes/Serialization/SceneObjectSerializer.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/Serialization') diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index b6aa31b..3a48299 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -1438,10 +1438,21 @@ namespace OpenSim.Region.Framework.Scenes.Serialization Quaternion quat; reader.ReadStartElement(name); - 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); + 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 + { + 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); + } + reader.ReadEndElement(); return quat; -- cgit v1.1