diff options
| author | Melanie | 2010-10-25 01:24:30 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-25 01:24:30 +0100 |
| commit | ac370cf57b8807db89747e7c40d3727de34274cf (patch) | |
| tree | a40ea7f045d80c9ac55425012dca8c1950b2b885 /bin/OpenMetaverse.StructuredData.XML | |
| parent | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL (diff) | |
| parent | * Updated libomv to r3461 (diff) | |
| download | opensim-SC_OLD-ac370cf57b8807db89747e7c40d3727de34274cf.zip opensim-SC_OLD-ac370cf57b8807db89747e7c40d3727de34274cf.tar.gz opensim-SC_OLD-ac370cf57b8807db89747e7c40d3727de34274cf.tar.bz2 opensim-SC_OLD-ac370cf57b8807db89747e7c40d3727de34274cf.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenMetaverse.StructuredData.XML | 12 |
1 files changed, 6 insertions, 6 deletions
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> |