diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 19 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 | ||||
-rwxr-xr-x | bin/OpenMetaverse.Rendering.Meshmerizer.dll | bin | 20480 -> 20480 bytes | |||
-rw-r--r-- | bin/OpenMetaverse.StructuredData.XML | 12 | ||||
-rw-r--r-- | bin/OpenMetaverse.StructuredData.dll | bin | 102400 -> 102400 bytes | |||
-rw-r--r-- | bin/OpenMetaverse.XML | 9 | ||||
-rw-r--r-- | bin/OpenMetaverse.dll | bin | 1716224 -> 1716224 bytes | |||
-rw-r--r-- | bin/OpenMetaverseTypes.dll | bin | 114688 -> 114688 bytes |
8 files changed, 29 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index dd7e057..ad994c9 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 | |||
1426 | 1426 | ||
1427 | reader.ReadStartElement(name); | 1427 | reader.ReadStartElement(name); |
1428 | vec.X = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // X or x | 1428 | vec.X = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // X or x |
1429 | vec.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Y or Y | 1429 | vec.Y = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Y or y |
1430 | vec.Z = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Z or z | 1430 | vec.Z = reader.ReadElementContentAsFloat(reader.Name, String.Empty); // Z or z |
1431 | reader.ReadEndElement(); | 1431 | reader.ReadEndElement(); |
1432 | 1432 | ||
@@ -1501,15 +1501,28 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1501 | 1501 | ||
1502 | reader.ReadStartElement(name, String.Empty); // Shape | 1502 | reader.ReadStartElement(name, String.Empty); // Shape |
1503 | 1503 | ||
1504 | string nodeName = string.Empty; | ||
1504 | while (reader.NodeType != XmlNodeType.EndElement) | 1505 | while (reader.NodeType != XmlNodeType.EndElement) |
1505 | { | 1506 | { |
1507 | nodeName = reader.Name; | ||
1506 | //m_log.DebugFormat("[XXX] Processing: {0}", reader.Name); | 1508 | //m_log.DebugFormat("[XXX] Processing: {0}", reader.Name); |
1507 | ShapeXmlProcessor p = null; | 1509 | ShapeXmlProcessor p = null; |
1508 | if (m_ShapeXmlProcessors.TryGetValue(reader.Name, out p)) | 1510 | if (m_ShapeXmlProcessors.TryGetValue(reader.Name, out p)) |
1509 | p(shape, reader); | 1511 | { |
1512 | try | ||
1513 | { | ||
1514 | p(shape, reader); | ||
1515 | } | ||
1516 | catch (Exception e) | ||
1517 | { | ||
1518 | m_log.DebugFormat("[SceneObjectSerializer]: exception while parsing Shape {0}: {1}", nodeName, e); | ||
1519 | if (reader.NodeType == XmlNodeType.EndElement) | ||
1520 | reader.Read(); | ||
1521 | } | ||
1522 | } | ||
1510 | else | 1523 | else |
1511 | { | 1524 | { |
1512 | // m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name); | 1525 | // m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name); |
1513 | reader.ReadOuterXml(); | 1526 | reader.ReadOuterXml(); |
1514 | } | 1527 | } |
1515 | } | 1528 | } |
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 1257804..d770ad1 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
287 | long start = 0; | 287 | long start = 0; |
288 | using (MemoryStream data = new MemoryStream(primShape.SculptData)) | 288 | using (MemoryStream data = new MemoryStream(primShape.SculptData)) |
289 | { | 289 | { |
290 | meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data, true); | 290 | meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data); |
291 | start = data.Position; | 291 | start = data.Position; |
292 | } | 292 | } |
293 | 293 | ||
@@ -324,7 +324,7 @@ namespace OpenSim.Region.Physics.Meshing | |||
324 | 324 | ||
325 | byte[] decompressedBuf = outMs.GetBuffer(); | 325 | byte[] decompressedBuf = outMs.GetBuffer(); |
326 | 326 | ||
327 | decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf, true); | 327 | decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf); |
328 | } | 328 | } |
329 | } | 329 | } |
330 | } | 330 | } |
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index 0160d21..f89ac5a 100755 --- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll +++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML index 2a0426c..f5842c8 100644 --- a/bin/OpenMetaverse.StructuredData.XML +++ b/bin/OpenMetaverse.StructuredData.XML | |||
@@ -135,17 +135,17 @@ | |||
135 | </member> | 135 | </member> |
136 | <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])"> | 136 | <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])"> |
137 | <summary> | 137 | <summary> |
138 | 138 | Deserializes binary LLSD | |
139 | </summary> | 139 | </summary> |
140 | <param name="binaryData"></param> | 140 | <param name="binaryData">Serialized data</param> |
141 | <returns></returns> | 141 | <returns>OSD containting deserialized data</returns> |
142 | </member> | 142 | </member> |
143 | <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)"> | 143 | <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)"> |
144 | <summary> | 144 | <summary> |
145 | 145 | Deserializes binary LLSD | |
146 | </summary> | 146 | </summary> |
147 | <param name="stream"></param> | 147 | <param name="stream">Stream to read the data from</param> |
148 | <returns></returns> | 148 | <returns>OSD containting deserialized data</returns> |
149 | </member> | 149 | </member> |
150 | <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)"> | 150 | <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)"> |
151 | <summary> | 151 | <summary> |
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index c1e54fa..33b19ca 100644 --- a/bin/OpenMetaverse.StructuredData.dll +++ b/bin/OpenMetaverse.StructuredData.dll | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML index 56f0c87..f5bda4b 100644 --- a/bin/OpenMetaverse.XML +++ b/bin/OpenMetaverse.XML | |||
@@ -10318,12 +10318,13 @@ | |||
10318 | <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param> | 10318 | <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param> |
10319 | <param name="message">custom message to send with invitation</param> | 10319 | <param name="message">custom message to send with invitation</param> |
10320 | </member> | 10320 | </member> |
10321 | <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,System.Boolean)"> | 10321 | <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)"> |
10322 | <summary> | 10322 | <summary> |
10323 | Respond to a teleport lure by either accepting it and initiating | 10323 | Respond to a teleport lure by either accepting it and initiating |
10324 | the teleport, or denying it | 10324 | the teleport, or denying it |
10325 | </summary> | 10325 | </summary> |
10326 | <param name="requesterID"><seealso cref="T:OpenMetaverse.UUID"/> of the avatar sending the lure</param> | 10326 | <param name="requesterID"><seealso cref="T:OpenMetaverse.UUID"/> of the avatar sending the lure</param> |
10327 | <param name="sessionID">IM session <seealso cref="T:OpenMetaverse.UUID"/> of the incoming lure request</param> | ||
10327 | <param name="accept">true to accept the lure, false to decline it</param> | 10328 | <param name="accept">true to accept the lure, false to decline it</param> |
10328 | </member> | 10329 | </member> |
10329 | <member name="M:OpenMetaverse.AgentManager.UpdateProfile(OpenMetaverse.Avatar.AvatarProperties)"> | 10330 | <member name="M:OpenMetaverse.AgentManager.UpdateProfile(OpenMetaverse.Avatar.AvatarProperties)"> |
@@ -19866,9 +19867,6 @@ | |||
19866 | <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER"> | 19867 | <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER"> |
19867 | <summary>Total number of wearables per bake layer</summary> | 19868 | <summary>Total number of wearables per bake layer</summary> |
19868 | </member> | 19869 | </member> |
19869 | <member name="F:OpenMetaverse.AppearanceManager.AVATAR_TEXTURE_COUNT"> | ||
19870 | <summary>Total number of textures on an avatar, baked or not</summary> | ||
19871 | </member> | ||
19872 | <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex"> | 19870 | <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex"> |
19873 | <summary>Mapping between BakeType and AvatarTextureIndex</summary> | 19871 | <summary>Mapping between BakeType and AvatarTextureIndex</summary> |
19874 | </member> | 19872 | </member> |
@@ -20315,6 +20313,9 @@ | |||
20315 | <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color"> | 20313 | <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color"> |
20316 | <summary>Tint that should be applied to the texture</summary> | 20314 | <summary>Tint that should be applied to the texture</summary> |
20317 | </member> | 20315 | </member> |
20316 | <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex"> | ||
20317 | <summary>Where on avatar does this texture belong</summary> | ||
20318 | </member> | ||
20318 | <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs"> | 20319 | <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs"> |
20319 | <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary> | 20320 | <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary> |
20320 | </member> | 20321 | </member> |
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index a07d64f..f5952b4 100644 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index 2d7a372..f4f701b 100644 --- a/bin/OpenMetaverseTypes.dll +++ b/bin/OpenMetaverseTypes.dll | |||
Binary files differ | |||