aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenMetaverse.StructuredData.XML
diff options
context:
space:
mode:
authoropensim mirror account2010-10-24 16:40:06 -0700
committeropensim mirror account2010-10-24 16:40:06 -0700
commita2c0ee8da7450b3117cae12fed9496f4576d05ed (patch)
tree570f90a54a035a1cebd160a66369d53d12935053 /bin/OpenMetaverse.StructuredData.XML
parentMerge branch 'master' of /var/git/opensim/ (diff)
parent* Updated libomv to r3461 (diff)
downloadopensim-SC_OLD-a2c0ee8da7450b3117cae12fed9496f4576d05ed.zip
opensim-SC_OLD-a2c0ee8da7450b3117cae12fed9496f4576d05ed.tar.gz
opensim-SC_OLD-a2c0ee8da7450b3117cae12fed9496f4576d05ed.tar.bz2
opensim-SC_OLD-a2c0ee8da7450b3117cae12fed9496f4576d05ed.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'bin/OpenMetaverse.StructuredData.XML')
-rw-r--r--bin/OpenMetaverse.StructuredData.XML12
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>