From 3f403efd5ec1c11b7e066a653e7b754878384f94 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Fri, 5 Jun 2009 06:27:43 +0000 Subject: [PATCH] * Adding an OSDParser.Deserialize() overload that takes a string git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@2848 52acb1d6-8a22-11de-b505-999d5b087335 --- OpenMetaverse.StructuredData/StructuredData.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/OpenMetaverse.StructuredData/StructuredData.cs b/OpenMetaverse.StructuredData/StructuredData.cs index d9b7b21a..01851fa5 100644 --- a/OpenMetaverse.StructuredData/StructuredData.cs +++ b/OpenMetaverse.StructuredData/StructuredData.cs @@ -1137,6 +1137,16 @@ namespace OpenMetaverse.StructuredData return DeserializeJson(Encoding.UTF8.GetString(data)); } + public static OSD Deserialize(string data) + { + if (data.StartsWith(LLSD_BINARY_HEADER)) + return DeserializeLLSDBinary(Encoding.UTF8.GetBytes(data)); + else if (data.StartsWith(LLSD_XML_HEADER) || data.StartsWith(LLSD_XML_ALT_HEADER) || data.StartsWith(LLSD_XML_ALT2_HEADER)) + return DeserializeLLSDXml(data); + else + return DeserializeJson(data); + } + public static OSD Deserialize(Stream stream) { if (stream.CanSeek)