diff options
| author | Jonathan Freedman | 2010-10-25 22:27:35 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-25 22:27:35 -0400 |
| commit | 5da2743c374907044be0480297b3f21d7538faef (patch) | |
| tree | dc7c535b0ea0092c35681b0c77400c3e26b25971 /bin/OpenMetaverse.StructuredData.XML | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | * Updated libomv to r3461 (diff) | |
| download | opensim-SC_OLD-5da2743c374907044be0480297b3f21d7538faef.zip opensim-SC_OLD-5da2743c374907044be0480297b3f21d7538faef.tar.gz opensim-SC_OLD-5da2743c374907044be0480297b3f21d7538faef.tar.bz2 opensim-SC_OLD-5da2743c374907044be0480297b3f21d7538faef.tar.xz | |
Merge branch 'master' into mantis5110
Diffstat (limited to 'bin/OpenMetaverse.StructuredData.XML')
| -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> |