Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/openmetaversefoundation/libopenmetaverse

Browse Source 
Conflicts:
	bin/log4net.dll
This commit is contained in:
Revolution Smythe
2013-03-06 21:05:49 -05:00
parent fdcb8c9ab5 f8f8e616b3
commit 4466e0c9db
113 changed files with 25561 additions and 15292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenMetaverse.StructuredData/StructuredData.cs
View File

@@ -1212,6 +1212,18 @@ namespace OpenMetaverse.StructuredData
{
string header = Encoding.ASCII.GetString(data, 0, data.Length >= 17 ? 17 : data.Length);
try
{
string uHeader = Encoding.UTF8.GetString(data, 0, data.Length >= 17 ? 17 : data.Length).TrimStart();
if (uHeader.StartsWith(LLSD_XML_HEADER, StringComparison.InvariantCultureIgnoreCase) ||
uHeader.StartsWith(LLSD_XML_ALT_HEADER, StringComparison.InvariantCultureIgnoreCase) ||
uHeader.StartsWith(LLSD_XML_ALT2_HEADER, StringComparison.InvariantCultureIgnoreCase))
{
return DeserializeLLSDXml(data);
}
}
catch { }
if (header.StartsWith(LLSD_BINARY_HEADER, StringComparison.InvariantCultureIgnoreCase))
{
return DeserializeLLSDBinary(data);