aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-19 10:47:40 +0000
committerJustin Clarke Casey2008-03-19 10:47:40 +0000
commit16cd6cd82eec2aa28d86586928d3ab134425756e (patch)
treed3615860fe9034196f11d9306c08f9dd8f04ff33
parentFixed some comparisons of LLUUIDs to null. (diff)
downloadopensim-SC_OLD-16cd6cd82eec2aa28d86586928d3ab134425756e.zip
opensim-SC_OLD-16cd6cd82eec2aa28d86586928d3ab134425756e.tar.gz
opensim-SC_OLD-16cd6cd82eec2aa28d86586928d3ab134425756e.tar.bz2
opensim-SC_OLD-16cd6cd82eec2aa28d86586928d3ab134425756e.tar.xz
* Documentation patch from krtaylor. Thanks!
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs5
3 files changed, 10 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index bd2def0..165aeb1 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -47,6 +47,8 @@ Patches
47* brianw/Sir_Ahzz 47* brianw/Sir_Ahzz
48* ChrisDown 48* ChrisDown
49* devalnor-#708 49* devalnor-#708
50* Diva Canto
51* krtaylor (IBM)
50 52
51 53
52LSL Devs 54LSL Devs
diff --git a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
index fed8e07..ebc8568 100644
--- a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
@@ -133,6 +133,9 @@ namespace OpenSim.Region.Environment.Modules
133 LLUUID reqID = LLUUID.Random(); 133 LLUUID reqID = LLUUID.Random();
134 HttpRequestClass htc = new HttpRequestClass(); 134 HttpRequestClass htc = new HttpRequestClass();
135 135
136 // Partial implementation: support for parameter flags needed
137 // see http://wiki.secondlife.com/wiki/LlHTTPRequest
138 //
136 // Parameters are expected in {key, value, ... , key, value} 139 // Parameters are expected in {key, value, ... , key, value}
137 if (parameters != null) 140 if (parameters != null)
138 { 141 {
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 85cf0b7..ba0c8e5 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -4295,6 +4295,11 @@ namespace OpenSim.Region.ScriptEngine.Common
4295 4295
4296 public string llHTTPRequest(string url, LSL_Types.list parameters, string body) 4296 public string llHTTPRequest(string url, LSL_Types.list parameters, string body)
4297 { 4297 {
4298 // Partial implementation: support for parameter flags needed
4299 // see http://wiki.secondlife.com/wiki/LlHTTPRequest
4300 // parameter flags support are implemented in ScriptsHttpRequests.cs
4301 // in StartHttpRequest
4302
4298 m_host.AddScriptLPS(1); 4303 m_host.AddScriptLPS(1);
4299 IHttpRequests httpScriptMod = 4304 IHttpRequests httpScriptMod =
4300 m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>(); 4305 m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>();