aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
diff options
context:
space:
mode:
authorMW2007-12-07 22:29:16 +0000
committerMW2007-12-07 22:29:16 +0000
commita71f4c021b8d2fcf0e121145428aa797b8f7ca19 (patch)
tree8b425203d36f205445450ba3a88236b44a88baa5 /OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
parentmove to PacketQueue for throttling. This has been tested with a couple (diff)
downloadopensim-SC_OLD-a71f4c021b8d2fcf0e121145428aa797b8f7ca19.zip
opensim-SC_OLD-a71f4c021b8d2fcf0e121145428aa797b8f7ca19.tar.gz
opensim-SC_OLD-a71f4c021b8d2fcf0e121145428aa797b8f7ca19.tar.bz2
opensim-SC_OLD-a71f4c021b8d2fcf0e121145428aa797b8f7ca19.tar.xz
"Borrowed" the LLSD class from a older version of libsl, so that our LLSD decoding (used by CAPS) works again.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index ed25e71..71cc358 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -54,8 +54,10 @@ namespace OpenSim.Region.Capabilities
54 //string requestBody = streamReader.ReadToEnd(); 54 //string requestBody = streamReader.ReadToEnd();
55 //streamReader.Close(); 55 //streamReader.Close();
56 56
57 libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap) 57 // libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)
58 libsecondlife.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request)); 58 // libsecondlife.StructuredData.LLSDParser.DeserializeXml(new XmlTextReader(request));
59
60 Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(request);
59 TRequest llsdRequest = new TRequest(); 61 TRequest llsdRequest = new TRequest();
60 LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); 62 LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);
61 63