From b4c54765d297f258e69f239a48ec0b8fdb64d86d Mon Sep 17 00:00:00 2001
From: Latif Khalifa
Date: Fri, 15 Oct 2010 03:13:24 +0200
Subject: libomv update to support headerless llsd binary deserialization
needed for mesh asset decoding
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
---
bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 20480 -> 20480 bytes
bin/OpenMetaverse.StructuredData.XML | 28 +++++++++++++++----
bin/OpenMetaverse.StructuredData.dll | Bin 102400 -> 102400 bytes
bin/OpenMetaverse.XML | 41 ++++++++++++++++++++++++++++
bin/OpenMetaverse.dll | Bin 1712128 -> 1716224 bytes
bin/OpenMetaverseTypes.dll | Bin 114688 -> 114688 bytes
6 files changed, 63 insertions(+), 6 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index f66a3dc..0160d21 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 2a0426c..35f2864 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -135,17 +135,33 @@
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
<summary>
-
+ Deserializes binary LLSD
</summary>
- <param name="binaryData"></param>
- <returns></returns>
+ <param name="binaryData">Serialized data</param>
+ <returns>OSD containting deserialized data</returns>
+ </member>
+ <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[],System.Boolean)">
+ <summary>
+ Deserializes binary LLSD
+ </summary>
+ <param name="binaryData">Serialized data</param>
+ <param name="headerOptional">Treat LLSD binary header as optional</param>
+ <returns>OSD containting deserialized data</returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)">
<summary>
-
+ Deserializes binary LLSD
</summary>
- <param name="stream"></param>
- <returns></returns>
+ <param name="stream">Stream to read the data from</param>
+ <returns>OSD containting deserialized data</returns>
+ </member>
+ <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream,System.Boolean)">
+ <summary>
+ Deserializes binary LLSD
+ </summary>
+ <param name="stream">Stream to read the data from</param>
+ <param name="headerOptional">Treat LLSD binary header as optional</param>
+ <returns>OSD containting deserialized data</returns>
</member>
<member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)">
<summary>
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 57a595c..c1e54fa 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 e8299fd..56f0c87 100644
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
@@ -3497,6 +3497,13 @@
</summary>
<param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID"/></param>
</member>
+ <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)">
+ <summary>
+ Requests download of a mesh asset
+ </summary>
+ <param name="meshID">UUID of the mesh asset</param>
+ <param name="callback">Callback when the request completes</param>
+ </member>
<member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)">
<summary>
Lets TexturePipeline class fire the progress event
@@ -3573,6 +3580,13 @@
</summary>
<param name="newAssetID">Asset UUID of the newly uploaded baked texture</param>
</member>
+ <member name="T:OpenMetaverse.AssetManager.MeshDownloadCallback">
+ <summary>
+ A callback that fires upon the completition of the RequestMesh call
+ </summary>
+ <param name="success">Was the download successfull</param>
+ <param name="assetMesh">Resulting mesh or null on problems</param>
+ </member>
<member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
<summary>Xfer data</summary>
</member>
@@ -20343,6 +20357,33 @@
Level of Detail mesh
</summary>
</member>
+ <member name="T:OpenMetaverse.Assets.AssetMesh">
+ <summary>
+ Represents Mesh asset
+ </summary>
+ </member>
+ <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor">
+ <summary>Initializes a new instance of an AssetMesh object</summary>
+ </member>
+ <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor(OpenMetaverse.UUID,System.Byte[])">
+ <summary>Initializes a new instance of an AssetMesh object with parameters</summary>
+ <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param>
+ <param name="assetData">A byte array containing the raw asset data</param>
+ </member>
+ <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
+ <summary>
+ TODO: Encodes a scripts contents into a LSO Bytecode file
+ </summary>
+ </member>
+ <member name="M:OpenMetaverse.Assets.AssetMesh.Decode">
+ <summary>
+ TODO: Decode LSO Bytecode into a string
+ </summary>
+ <returns>true</returns>
+ </member>
+ <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
+ <summary>Override the base classes AssetType</summary>
+ </member>
<member name="T:OpenMetaverse.TextureRequestState">
<summary>
The current status of a texture request as it moves through the pipeline or final result of a texture request.
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index c4e4c99..a07d64f 100644
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index ff57567..2d7a372 100644
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ
--
cgit v1.1