diff options
author | UbitUmarov | 2018-07-14 21:48:59 +0100 |
---|---|---|
committer | UbitUmarov | 2018-07-14 21:48:59 +0100 |
commit | aee981e5e2c0bbbfc5c6e840fe13fb107bc47804 (patch) | |
tree | 12395a70198eb03f75a8ec95cbfe2409314832ce /OpenSim/Region | |
parent | http reusecontext is obsolete (diff) | |
download | opensim-SC-aee981e5e2c0bbbfc5c6e840fe13fb107bc47804.zip opensim-SC-aee981e5e2c0bbbfc5c6e840fe13fb107bc47804.tar.gz opensim-SC-aee981e5e2c0bbbfc5c6e840fe13fb107bc47804.tar.bz2 opensim-SC-aee981e5e2c0bbbfc5c6e840fe13fb107bc47804.tar.xz |
http reusecontext is obsolete
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 5f72733..31c317c 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -520,7 +520,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
520 | response["str_response_string"] = "Script timeout"; | 520 | response["str_response_string"] = "Script timeout"; |
521 | response["content_type"] = "text/plain"; | 521 | response["content_type"] = "text/plain"; |
522 | response["keepalive"] = false; | 522 | response["keepalive"] = false; |
523 | response["reusecontext"] = false; | ||
524 | 523 | ||
525 | //remove from map | 524 | //remove from map |
526 | lock (url.requests) | 525 | lock (url.requests) |
@@ -619,7 +618,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
619 | response["str_response_string"] = "Script timeout"; | 618 | response["str_response_string"] = "Script timeout"; |
620 | response["content_type"] = "text/plain"; | 619 | response["content_type"] = "text/plain"; |
621 | response["keepalive"] = false; | 620 | response["keepalive"] = false; |
622 | response["reusecontext"] = false; | ||
623 | return response; | 621 | return response; |
624 | } | 622 | } |
625 | //put response | 623 | //put response |
@@ -627,7 +625,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
627 | response["str_response_string"] = requestData.responseBody; | 625 | response["str_response_string"] = requestData.responseBody; |
628 | response["content_type"] = requestData.responseType; | 626 | response["content_type"] = requestData.responseType; |
629 | response["keepalive"] = false; | 627 | response["keepalive"] = false; |
630 | response["reusecontext"] = false; | ||
631 | 628 | ||
632 | if (url.allowXss) | 629 | if (url.allowXss) |
633 | response["access_control_allow_origin"] = "*"; | 630 | response["access_control_allow_origin"] = "*"; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 89211a5..1345956 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -549,7 +549,6 @@ namespace SecondLife | |||
549 | parameters.TreatWarningsAsErrors = false; | 549 | parameters.TreatWarningsAsErrors = false; |
550 | parameters.GenerateInMemory = false; | 550 | parameters.GenerateInMemory = false; |
551 | 551 | ||
552 | // this seems to cause issues on some windows servers | ||
553 | // parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath, | 552 | // parameters.TempFiles = new TempFileCollection(Path.Combine(ScriptEnginesPath, |
554 | // m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation); | 553 | // m_scriptEngine.World.RegionInfo.RegionID.ToString()), CompileWithDebugInformation); |
555 | 554 | ||