diff options
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/CAPSService.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 13 |
2 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs index caf96ff..07bea9d 100644 --- a/OpenSim/Framework/Communications/CAPSService.cs +++ b/OpenSim/Framework/Communications/CAPSService.cs | |||
@@ -45,7 +45,8 @@ namespace OpenSim.Framework.Communications | |||
45 | m_server.AddStreamHandler(new RestStreamHandler("POST", path, restMethod)); | 45 | m_server.AddStreamHandler(new RestStreamHandler("POST", path, restMethod)); |
46 | } | 46 | } |
47 | 47 | ||
48 | public string CapsRequest(string request, string path, string param) | 48 | public string CapsRequest(string request, string path, string param, |
49 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
49 | { | 50 | { |
50 | System.Console.WriteLine("new caps request " + request + " from path " + path); | 51 | System.Console.WriteLine("new caps request " + request + " from path " + path); |
51 | return String.Empty; | 52 | return String.Empty; |
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 9725c94..8d8f945 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -208,8 +208,11 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
208 | /// <param name="request"></param> | 208 | /// <param name="request"></param> |
209 | /// <param name="path"></param> | 209 | /// <param name="path"></param> |
210 | /// <param name="param"></param> | 210 | /// <param name="param"></param> |
211 | /// <param name="httpRequest">HTTP request header object</param> | ||
212 | /// <param name="httpResponse">HTTP response header object</param> | ||
211 | /// <returns></returns> | 213 | /// <returns></returns> |
212 | public string CapsRequest(string request, string path, string param) | 214 | public string CapsRequest(string request, string path, string param, |
215 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
213 | { | 216 | { |
214 | m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); | 217 | m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); |
215 | //Console.WriteLine("caps request " + request); | 218 | //Console.WriteLine("caps request " + request); |
@@ -503,8 +506,11 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
503 | /// <param name="request"></param> | 506 | /// <param name="request"></param> |
504 | /// <param name="path"></param> | 507 | /// <param name="path"></param> |
505 | /// <param name="param"></param> | 508 | /// <param name="param"></param> |
509 | /// <param name="httpRequest">HTTP request header object</param> | ||
510 | /// <param name="httpResponse">HTTP response header object</param> | ||
506 | /// <returns></returns> | 511 | /// <returns></returns> |
507 | public string ScriptTaskInventory(string request, string path, string param) | 512 | public string ScriptTaskInventory(string request, string path, string param, |
513 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
508 | { | 514 | { |
509 | try | 515 | try |
510 | { | 516 | { |
@@ -558,7 +564,8 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
558 | /// <param name="path"></param> | 564 | /// <param name="path"></param> |
559 | /// <param name="param"></param> | 565 | /// <param name="param"></param> |
560 | /// <returns></returns> | 566 | /// <returns></returns> |
561 | public string NoteCardAgentInventory(string request, string path, string param) | 567 | public string NoteCardAgentInventory(string request, string path, string param, |
568 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
562 | { | 569 | { |
563 | m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); | 570 | m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); |
564 | //libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request)); | 571 | //libsecondlife.StructuredData.LLSDMap hash = (libsecondlife.StructuredData.LLSDMap)libsecondlife.StructuredData.LLSDParser.DeserializeBinary(Helpers.StringToField(request)); |