diff options
author | Latif Khalifa | 2010-10-15 03:13:24 +0200 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-10-14 21:26:26 -0400 |
commit | b4c54765d297f258e69f239a48ec0b8fdb64d86d (patch) | |
tree | 176c874d013a4d6ca23dbf7ce65a4e74e230e386 /bin | |
parent | laying some groundwork for mesh physics (diff) | |
download | opensim-SC_OLD-b4c54765d297f258e69f239a48ec0b8fdb64d86d.zip opensim-SC_OLD-b4c54765d297f258e69f239a48ec0b8fdb64d86d.tar.gz opensim-SC_OLD-b4c54765d297f258e69f239a48ec0b8fdb64d86d.tar.bz2 opensim-SC_OLD-b4c54765d297f258e69f239a48ec0b8fdb64d86d.tar.xz |
libomv update to support headerless llsd binary deserialization needed for mesh asset decoding
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
Diffstat (limited to '')
-rwxr-xr-x | bin/OpenMetaverse.Rendering.Meshmerizer.dll | bin | 20480 -> 20480 bytes | |||
-rw-r--r-- | bin/OpenMetaverse.StructuredData.XML | 28 | ||||
-rw-r--r-- | bin/OpenMetaverse.StructuredData.dll | bin | 102400 -> 102400 bytes | |||
-rw-r--r-- | bin/OpenMetaverse.XML | 41 | ||||
-rw-r--r-- | bin/OpenMetaverse.dll | bin | 1712128 -> 1716224 bytes | |||
-rw-r--r-- | bin/OpenMetaverseTypes.dll | bin | 114688 -> 114688 bytes |
6 files changed, 63 insertions, 6 deletions
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index f66a3dc..0160d21 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..35f2864 100644 --- a/bin/OpenMetaverse.StructuredData.XML +++ b/bin/OpenMetaverse.StructuredData.XML | |||
@@ -135,17 +135,33 @@ | |||
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> | ||
143 | <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[],System.Boolean)"> | ||
144 | <summary> | ||
145 | Deserializes binary LLSD | ||
146 | </summary> | ||
147 | <param name="binaryData">Serialized data</param> | ||
148 | <param name="headerOptional">Treat LLSD binary header as optional</param> | ||
149 | <returns>OSD containting deserialized data</returns> | ||
142 | </member> | 150 | </member> |
143 | <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)"> | 151 | <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)"> |
144 | <summary> | 152 | <summary> |
145 | 153 | Deserializes binary LLSD | |
146 | </summary> | 154 | </summary> |
147 | <param name="stream"></param> | 155 | <param name="stream">Stream to read the data from</param> |
148 | <returns></returns> | 156 | <returns>OSD containting deserialized data</returns> |
157 | </member> | ||
158 | <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream,System.Boolean)"> | ||
159 | <summary> | ||
160 | Deserializes binary LLSD | ||
161 | </summary> | ||
162 | <param name="stream">Stream to read the data from</param> | ||
163 | <param name="headerOptional">Treat LLSD binary header as optional</param> | ||
164 | <returns>OSD containting deserialized data</returns> | ||
149 | </member> | 165 | </member> |
150 | <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)"> | 166 | <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)"> |
151 | <summary> | 167 | <summary> |
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index 57a595c..c1e54fa 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 e8299fd..56f0c87 100644 --- a/bin/OpenMetaverse.XML +++ b/bin/OpenMetaverse.XML | |||
@@ -3497,6 +3497,13 @@ | |||
3497 | </summary> | 3497 | </summary> |
3498 | <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID"/></param> | 3498 | <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID"/></param> |
3499 | </member> | 3499 | </member> |
3500 | <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)"> | ||
3501 | <summary> | ||
3502 | Requests download of a mesh asset | ||
3503 | </summary> | ||
3504 | <param name="meshID">UUID of the mesh asset</param> | ||
3505 | <param name="callback">Callback when the request completes</param> | ||
3506 | </member> | ||
3500 | <member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)"> | 3507 | <member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)"> |
3501 | <summary> | 3508 | <summary> |
3502 | Lets TexturePipeline class fire the progress event | 3509 | Lets TexturePipeline class fire the progress event |
@@ -3573,6 +3580,13 @@ | |||
3573 | </summary> | 3580 | </summary> |
3574 | <param name="newAssetID">Asset UUID of the newly uploaded baked texture</param> | 3581 | <param name="newAssetID">Asset UUID of the newly uploaded baked texture</param> |
3575 | </member> | 3582 | </member> |
3583 | <member name="T:OpenMetaverse.AssetManager.MeshDownloadCallback"> | ||
3584 | <summary> | ||
3585 | A callback that fires upon the completition of the RequestMesh call | ||
3586 | </summary> | ||
3587 | <param name="success">Was the download successfull</param> | ||
3588 | <param name="assetMesh">Resulting mesh or null on problems</param> | ||
3589 | </member> | ||
3576 | <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer"> | 3590 | <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer"> |
3577 | <summary>Xfer data</summary> | 3591 | <summary>Xfer data</summary> |
3578 | </member> | 3592 | </member> |
@@ -20343,6 +20357,33 @@ | |||
20343 | Level of Detail mesh | 20357 | Level of Detail mesh |
20344 | </summary> | 20358 | </summary> |
20345 | </member> | 20359 | </member> |
20360 | <member name="T:OpenMetaverse.Assets.AssetMesh"> | ||
20361 | <summary> | ||
20362 | Represents Mesh asset | ||
20363 | </summary> | ||
20364 | </member> | ||
20365 | <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor"> | ||
20366 | <summary>Initializes a new instance of an AssetMesh object</summary> | ||
20367 | </member> | ||
20368 | <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor(OpenMetaverse.UUID,System.Byte[])"> | ||
20369 | <summary>Initializes a new instance of an AssetMesh object with parameters</summary> | ||
20370 | <param name="assetID">A unique <see cref="T:OpenMetaverse.UUID"/> specific to this asset</param> | ||
20371 | <param name="assetData">A byte array containing the raw asset data</param> | ||
20372 | </member> | ||
20373 | <member name="M:OpenMetaverse.Assets.AssetMesh.Encode"> | ||
20374 | <summary> | ||
20375 | TODO: Encodes a scripts contents into a LSO Bytecode file | ||
20376 | </summary> | ||
20377 | </member> | ||
20378 | <member name="M:OpenMetaverse.Assets.AssetMesh.Decode"> | ||
20379 | <summary> | ||
20380 | TODO: Decode LSO Bytecode into a string | ||
20381 | </summary> | ||
20382 | <returns>true</returns> | ||
20383 | </member> | ||
20384 | <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType"> | ||
20385 | <summary>Override the base classes AssetType</summary> | ||
20386 | </member> | ||
20346 | <member name="T:OpenMetaverse.TextureRequestState"> | 20387 | <member name="T:OpenMetaverse.TextureRequestState"> |
20347 | <summary> | 20388 | <summary> |
20348 | The current status of a texture request as it moves through the pipeline or final result of a texture request. | 20389 | 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 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
Binary files differ | |||
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index ff57567..2d7a372 100644 --- a/bin/OpenMetaverseTypes.dll +++ b/bin/OpenMetaverseTypes.dll | |||
Binary files differ | |||