diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index dd7e0571e4..ad994c9208 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1426,7 +1426,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
reader.ReadStartElement(name);
vec.X = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // X or x
- vec.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Y or Y
+ vec.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Y or y
vec.Z = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Z or z
reader.ReadEndElement();
@@ -1501,15 +1501,28 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
reader.ReadStartElement(name, String.Empty); // Shape
+ string nodeName = string.Empty;
while (reader.NodeType != XmlNodeType.EndElement)
{
+ nodeName = reader.Name;
//m_log.DebugFormat("[XXX] Processing: {0}", reader.Name);
ShapeXmlProcessor p = null;
if (m_ShapeXmlProcessors.TryGetValue(reader.Name, out p))
- p(shape, reader);
+ {
+ try
+ {
+ p(shape, reader);
+ }
+ catch (Exception e)
+ {
+ m_log.DebugFormat("[SceneObjectSerializer]: exception while parsing Shape {0}: {1}", nodeName, e);
+ if (reader.NodeType == XmlNodeType.EndElement)
+ reader.Read();
+ }
+ }
else
{
-// m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name);
+ // m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name);
reader.ReadOuterXml();
}
}
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 1257804cfa..d770ad1aa7 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Physics.Meshing
long start = 0;
using (MemoryStream data = new MemoryStream(primShape.SculptData))
{
- meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data, true);
+ meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data);
start = data.Position;
}
@@ -324,7 +324,7 @@ namespace OpenSim.Region.Physics.Meshing
byte[] decompressedBuf = outMs.GetBuffer();
- decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf, true);
+ decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
}
}
}
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 0160d21188..f89ac5a595 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index 2a0426c749..f5842c8154 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -135,17 +135,17 @@
-
+ Deserializes binary LLSD
-
-
+ Serialized data
+ OSD containting deserialized data
-
+ Deserializes binary LLSD
-
-
+ Stream to read the data from
+ OSD containting deserialized data
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index c1e54faf65..33b19caea0 100644
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML
index 56f0c87dcf..f5bda4b4b9 100644
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
@@ -10318,12 +10318,13 @@
target avatars to lure
custom message to send with invitation
-
+
Respond to a teleport lure by either accepting it and initiating
the teleport, or denying it
of the avatar sending the lure
+ IM session of the incoming lure request
true to accept the lure, false to decline it
@@ -19866,9 +19867,6 @@
Total number of wearables per bake layer
-
- Total number of textures on an avatar, baked or not
-
Mapping between BakeType and AvatarTextureIndex
@@ -20315,6 +20313,9 @@
Tint that should be applied to the texture
+
+ Where on avatar does this texture belong
+
Contains the Event data returned from the data server from an AgentWearablesRequest
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index a07d64f008..f5952b45a2 100644
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 2d7a372e51..f4f701bac4 100644
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ