diff options
| author | opensim mirror account | 2010-10-14 18:30:05 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-14 18:30:05 -0700 |
| commit | 49b4281ac61c17ab9564e02eceae29c2b513f173 (patch) | |
| tree | 176c874d013a4d6ca23dbf7ce65a4e74e230e386 /bin/OpenMetaverse.StructuredData.XML | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | libomv update to support headerless llsd binary deserialization needed for me... (diff) | |
| download | opensim-SC_OLD-49b4281ac61c17ab9564e02eceae29c2b513f173.zip opensim-SC_OLD-49b4281ac61c17ab9564e02eceae29c2b513f173.tar.gz opensim-SC_OLD-49b4281ac61c17ab9564e02eceae29c2b513f173.tar.bz2 opensim-SC_OLD-49b4281ac61c17ab9564e02eceae29c2b513f173.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'bin/OpenMetaverse.StructuredData.XML')
| -rw-r--r-- | bin/OpenMetaverse.StructuredData.XML | 28 |
1 files changed, 22 insertions, 6 deletions
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> |