aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting/HttpRequest
diff options
context:
space:
mode:
authorUbitUmarov2017-07-20 11:30:12 +0100
committerUbitUmarov2017-07-20 11:30:12 +0100
commitfe6ad384e43c11c3bf6268f5ab6fe3ea37c74540 (patch)
tree44ae3d8b00f3d2f6bf78bc0226a779f99ed6dc48 /OpenSim/Region/CoreModules/Scripting/HttpRequest
parentMerge branch 'master' into httptests (diff)
parentfix object updates throttle for scripts doing motion by direct change of posi... (diff)
downloadopensim-SC-fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540.zip
opensim-SC-fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540.tar.gz
opensim-SC-fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540.tar.bz2
opensim-SC-fe6ad384e43c11c3bf6268f5ab6fe3ea37c74540.tar.xz
merge
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/HttpRequest')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index b499b19..d342163 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -379,9 +379,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
379 if (ThreadPool == null) 379 if (ThreadPool == null)
380 { 380 {
381 STPStartInfo startInfo = new STPStartInfo(); 381 STPStartInfo startInfo = new STPStartInfo();
382 startInfo.IdleTimeout = 20000; 382 startInfo.IdleTimeout = 2000;
383 startInfo.MaxWorkerThreads = maxThreads; 383 startInfo.MaxWorkerThreads = maxThreads;
384 startInfo.MinWorkerThreads = 1; 384 startInfo.MinWorkerThreads = 0;
385 startInfo.ThreadPriority = ThreadPriority.BelowNormal; 385 startInfo.ThreadPriority = ThreadPriority.BelowNormal;
386 startInfo.StartSuspended = true; 386 startInfo.StartSuspended = true;
387 startInfo.ThreadPoolName = "ScriptsHttpReq"; 387 startInfo.ThreadPoolName = "ScriptsHttpReq";