* Updated libomv to r3461

Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
viewer-2-initial-appearance
Latif Khalifa 2010-10-24 22:47:53 +02:00 committed by Melanie
parent 852c61aaa6
commit c74c1620a1
7 changed files with 13 additions and 12 deletions

View File

@ -287,7 +287,7 @@ namespace OpenSim.Region.Physics.Meshing
long start = 0; long start = 0;
using (MemoryStream data = new MemoryStream(primShape.SculptData)) using (MemoryStream data = new MemoryStream(primShape.SculptData))
{ {
meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data, true); meshOsd = (OSDMap)OSDParser.DeserializeLLSDBinary(data);
start = data.Position; start = data.Position;
} }
@ -324,7 +324,7 @@ namespace OpenSim.Region.Physics.Meshing
byte[] decompressedBuf = outMs.GetBuffer(); byte[] decompressedBuf = outMs.GetBuffer();
decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf, true); decodedMeshOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
} }
} }
} }

View File

@ -135,17 +135,17 @@
</member> </member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])"> <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
<summary> <summary>
Deserializes binary LLSD
</summary> </summary>
<param name="binaryData"></param> <param name="binaryData">Serialized data</param>
<returns></returns> <returns>OSD containting deserialized data</returns>
</member> </member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)"> <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)">
<summary> <summary>
Deserializes binary LLSD
</summary> </summary>
<param name="stream"></param> <param name="stream">Stream to read the data from</param>
<returns></returns> <returns>OSD containting deserialized data</returns>
</member> </member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)"> <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)">
<summary> <summary>

Binary file not shown.

View File

@ -10318,12 +10318,13 @@
<param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param> <param name="targetID">target avatars <seealso cref="T:OpenMetaverse.UUID"/> to lure</param>
<param name="message">custom message to send with invitation</param> <param name="message">custom message to send with invitation</param>
</member> </member>
<member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,System.Boolean)"> <member name="M:OpenMetaverse.AgentManager.TeleportLureRespond(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
<summary> <summary>
Respond to a teleport lure by either accepting it and initiating Respond to a teleport lure by either accepting it and initiating
the teleport, or denying it the teleport, or denying it
</summary> </summary>
<param name="requesterID"><seealso cref="T:OpenMetaverse.UUID"/> of the avatar sending the lure</param> <param name="requesterID"><seealso cref="T:OpenMetaverse.UUID"/> of the avatar sending the lure</param>
<param name="sessionID">IM session <seealso cref="T:OpenMetaverse.UUID"/> of the incoming lure request</param>
<param name="accept">true to accept the lure, false to decline it</param> <param name="accept">true to accept the lure, false to decline it</param>
</member> </member>
<member name="M:OpenMetaverse.AgentManager.UpdateProfile(OpenMetaverse.Avatar.AvatarProperties)"> <member name="M:OpenMetaverse.AgentManager.UpdateProfile(OpenMetaverse.Avatar.AvatarProperties)">
@ -19866,9 +19867,6 @@
<member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER"> <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
<summary>Total number of wearables per bake layer</summary> <summary>Total number of wearables per bake layer</summary>
</member> </member>
<member name="F:OpenMetaverse.AppearanceManager.AVATAR_TEXTURE_COUNT">
<summary>Total number of textures on an avatar, baked or not</summary>
</member>
<member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex"> <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
<summary>Mapping between BakeType and AvatarTextureIndex</summary> <summary>Mapping between BakeType and AvatarTextureIndex</summary>
</member> </member>
@ -20315,6 +20313,9 @@
<member name="F:OpenMetaverse.AppearanceManager.TextureData.Color"> <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
<summary>Tint that should be applied to the texture</summary> <summary>Tint that should be applied to the texture</summary>
</member> </member>
<member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
<summary>Where on avatar does this texture belong</summary>
</member>
<member name="T:OpenMetaverse.AgentWearablesReplyEventArgs"> <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
<summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary> <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
</member> </member>

Binary file not shown.

Binary file not shown.