diff options
author | Master ScienceSim | 2010-10-28 09:09:42 -0700 |
---|---|---|
committer | Master ScienceSim | 2010-10-28 09:09:42 -0700 |
commit | f2c1d0e34feba801ff85c35ee049ed6d3067bb0d (patch) | |
tree | ff692ecc0db2b9cdf4cacd5a42234a5bb58ddd34 /bin/OpenMetaverse.StructuredData.XML | |
parent | Added background thread to handle delayed send and save of appearance (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.zip opensim-SC_OLD-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.gz opensim-SC_OLD-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.bz2 opensim-SC_OLD-f2c1d0e34feba801ff85c35ee049ed6d3067bb0d.tar.xz |
Merge branch 'opensim-master' into dev-appearance
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> |