diff options
author | Adam Johnson | 2007-12-07 08:54:31 +0000 |
---|---|---|
committer | Adam Johnson | 2007-12-07 08:54:31 +0000 |
commit | 3d938f76b7c2f8ede862f9979383d79dfb21372c (patch) | |
tree | 0c99beb3affa959f596e079f20ed806364e3d3dc /OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs | |
parent | * Added hacked support for 'anyone can move' and 'anyone can copy'. (diff) | |
download | opensim-SC-3d938f76b7c2f8ede862f9979383d79dfb21372c.zip opensim-SC-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.gz opensim-SC-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.bz2 opensim-SC-3d938f76b7c2f8ede862f9979383d79dfb21372c.tar.xz |
Updates to LibSL revision 1498. Thanks Johan!
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs index 08e9563..ed25e71 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs | |||
@@ -31,6 +31,7 @@ using System.IO; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
34 | using System.Xml; | ||
34 | 35 | ||
35 | namespace OpenSim.Region.Capabilities | 36 | namespace OpenSim.Region.Capabilities |
36 | { | 37 | { |
@@ -53,7 +54,8 @@ namespace OpenSim.Region.Capabilities | |||
53 | //string requestBody = streamReader.ReadToEnd(); | 54 | //string requestBody = streamReader.ReadToEnd(); |
54 | //streamReader.Close(); | 55 | //streamReader.Close(); |
55 | 56 | ||
56 | Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(request); | 57 | libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap) |
58 | libsecondlife.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); | ||
57 | TRequest llsdRequest = new TRequest(); | 59 | TRequest llsdRequest = new TRequest(); |
58 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); | 60 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); |
59 | 61 | ||
@@ -64,4 +66,4 @@ namespace OpenSim.Region.Capabilities | |||
64 | return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); | 66 | return encoding.GetBytes(LLSDHelpers.SerialiseLLSDReply(response)); |
65 | } | 67 | } |
66 | } | 68 | } |
67 | } \ No newline at end of file | 69 | } |