aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler
diff options
context:
space:
mode:
authorSean Dague2007-12-12 22:14:43 +0000
committerSean Dague2007-12-12 22:14:43 +0000
commit7625438adeb2211ee9c3f6532819eea2a0673c5d (patch)
tree6ce5553fa4c9fb60cf1024f2db639b9a386153da /OpenSim/Region/ScriptEngine/DotNetEngine/Compiler
parentThanks to Alondria for: (diff)
downloadopensim-SC_OLD-7625438adeb2211ee9c3f6532819eea2a0673c5d.zip
opensim-SC_OLD-7625438adeb2211ee9c3f6532819eea2a0673c5d.tar.gz
opensim-SC_OLD-7625438adeb2211ee9c3f6532819eea2a0673c5d.tar.bz2
opensim-SC_OLD-7625438adeb2211ee9c3f6532819eea2a0673c5d.tar.xz
From Michael Osias (IBM)
This patch implements the llHttpRequest function via a region module, HttpScriptsRequest. There were bits and peices in LSLLong_cmd_handler, which I moved into the region module, and just check for completed requests and dispatch the http_response callback event instead. works for me as of r2674
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs13
2 files changed, 13 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index deabec3..99f8d3b 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -1759,9 +1759,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
1759 return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2); 1759 return m_LSL_Functions.llXorBase64StringsCorrect(str1, str2);
1760 } 1760 }
1761 1761
1762 public void llHTTPRequest(string url, List<string> parameters, string body) 1762 public string llHTTPRequest(string url, List<string> parameters, string body)
1763 { 1763 {
1764 m_LSL_Functions.llHTTPRequest(url, parameters, body); 1764 return m_LSL_Functions.llHTTPRequest(url, parameters, body);
1765 } 1765 }
1766 1766
1767 public void llResetLandBanList() 1767 public void llResetLandBanList()
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 94479a0..aaac294 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -2451,9 +2451,18 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
2451 return llStringToBase64(ret); 2451 return llStringToBase64(ret);
2452 } 2452 }
2453 2453
2454 public void llHTTPRequest(string url, List<string> parameters, string body) 2454 public string llHTTPRequest(string url, List<string> parameters, string body)
2455 { 2455 {
2456 m_ScriptEngine.m_LSLLongCmdHandler.StartHttpRequest(m_localID, m_itemID, url, parameters, body); 2456 IHttpRequests httpScriptMod =
2457 m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>();
2458
2459 LLUUID reqID = httpScriptMod.
2460 StartHttpRequest(m_localID, m_itemID, url, parameters, body);
2461
2462 if( reqID != null )
2463 return reqID.ToString();
2464 else
2465 return null;
2457 } 2466 }
2458 2467
2459 public void llResetLandBanList() 2468 public void llResetLandBanList()