diff options
"Borrowed" the LLSD class from a older version of libsl, so that our LLSD decoding (used by CAPS) works again.
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities/Caps.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index f7cb20c..dd30e9f 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Capabilities | |||
55 | private string m_requestPath = "0000/"; | 55 | private string m_requestPath = "0000/"; |
56 | private string m_mapLayerPath = "0001/"; | 56 | private string m_mapLayerPath = "0001/"; |
57 | private string m_newInventory = "0002/"; | 57 | private string m_newInventory = "0002/"; |
58 | //private string m_requestTexture = "0003/"; | 58 | //private string m_requestTexture = "0003/"; |
59 | private string m_notecardUpdatePath = "0004/"; | 59 | private string m_notecardUpdatePath = "0004/"; |
60 | //private string eventQueue = "0100/"; | 60 | //private string eventQueue = "0100/"; |
61 | private BaseHttpServer m_httpListener; | 61 | private BaseHttpServer m_httpListener; |
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Capabilities | |||
125 | /// <returns></returns> | 125 | /// <returns></returns> |
126 | public string CapsRequest(string request, string path, string param) | 126 | public string CapsRequest(string request, string path, string param) |
127 | { | 127 | { |
128 | // Console.WriteLine("caps request " + request); | 128 | //Console.WriteLine("caps request " + request); |
129 | string result = LLSDHelpers.SerialiseLLSDReply(GetCapabilities()); | 129 | string result = LLSDHelpers.SerialiseLLSDReply(GetCapabilities()); |
130 | return result; | 130 | return result; |
131 | } | 131 | } |
@@ -140,10 +140,11 @@ namespace OpenSim.Region.Capabilities | |||
140 | string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + | 140 | string capsBaseUrl = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + |
141 | m_capsObjectPath; | 141 | m_capsObjectPath; |
142 | caps.MapLayer = capsBaseUrl + m_mapLayerPath; | 142 | caps.MapLayer = capsBaseUrl + m_mapLayerPath; |
143 | // caps.RequestTextureDownload = capsBaseUrl + m_requestTexture; | 143 | // caps.RequestTextureDownload = capsBaseUrl + m_requestTexture; |
144 | caps.NewFileAgentInventory = capsBaseUrl + m_newInventory; | 144 | caps.NewFileAgentInventory = capsBaseUrl + m_newInventory; |
145 | caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath; | 145 | caps.UpdateNotecardAgentInventory = capsBaseUrl + m_notecardUpdatePath; |
146 | caps.UpdateScriptAgentInventory = capsBaseUrl + m_notecardUpdatePath; | 146 | caps.UpdateScriptAgentInventory = capsBaseUrl + m_notecardUpdatePath; |
147 | // caps.UpdateScriptTaskInventory = capsBaseUrl + m_requestTexture; | ||
147 | return caps; | 148 | return caps; |
148 | } | 149 | } |
149 | 150 | ||
@@ -258,7 +259,8 @@ namespace OpenSim.Region.Capabilities | |||
258 | /// <returns></returns> | 259 | /// <returns></returns> |
259 | public string NoteCardAgentInventory(string request, string path, string param) | 260 | public string NoteCardAgentInventory(string request, string path, string param) |
260 | { | 261 | { |
261 | libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request)); | 262 | //libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request)); |
263 | Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Helpers.StringToField(request)); | ||
262 | LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); | 264 | LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); |
263 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); | 265 | LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest); |
264 | 266 | ||