aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenMetaverse.StructuredData.XML
diff options
context:
space:
mode:
authoropensim mirror account2010-10-14 20:30:04 -0700
committeropensim mirror account2010-10-14 20:30:04 -0700
commit19fdfc1a97fc68021317a0806e83f4487e0d5189 (patch)
tree69490e4ac18a743b862ea6d031a1c8fd9a66ae1d /bin/OpenMetaverse.StructuredData.XML
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentmore work in progress on mesh physics - still non-functional (diff)
downloadopensim-SC_OLD-19fdfc1a97fc68021317a0806e83f4487e0d5189.zip
opensim-SC_OLD-19fdfc1a97fc68021317a0806e83f4487e0d5189.tar.gz
opensim-SC_OLD-19fdfc1a97fc68021317a0806e83f4487e0d5189.tar.bz2
opensim-SC_OLD-19fdfc1a97fc68021317a0806e83f4487e0d5189.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'bin/OpenMetaverse.StructuredData.XML')
-rw-r--r--bin/OpenMetaverse.StructuredData.XML28
1 files changed, 6 insertions, 22 deletions
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index 35f2864..2a0426c 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -135,33 +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 Deserializes binary LLSD 138
139 </summary>
140 <param name="binaryData">Serialized data</param>
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> 139 </summary>
147 <param name="binaryData">Serialized data</param> 140 <param name="binaryData"></param>
148 <param name="headerOptional">Treat LLSD binary header as optional</param> 141 <returns></returns>
149 <returns>OSD containting deserialized data</returns>
150 </member> 142 </member>
151 <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)"> 143 <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.IO.Stream)">
152 <summary> 144 <summary>
153 Deserializes binary LLSD 145
154 </summary>
155 <param name="stream">Stream to read the data from</param>
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> 146 </summary>
162 <param name="stream">Stream to read the data from</param> 147 <param name="stream"></param>
163 <param name="headerOptional">Treat LLSD binary header as optional</param> 148 <returns></returns>
164 <returns>OSD containting deserialized data</returns>
165 </member> 149 </member>
166 <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)"> 150 <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinary(OpenMetaverse.StructuredData.OSD)">
167 <summary> 151 <summary>