aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-24 00:03:44 +0000
committerJustin Clark-Casey (justincc)2013-01-24 00:03:44 +0000
commit55c6753b13d4c8cd69cc986db5f6e321b8e65bb7 (patch)
tree70ae7a976ba9be4e7e8d1cb98d3a6e61e4dfb7d4 /OpenSim/Region/ScriptEngine/XEngine
parentAdd information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.zip
opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.gz
opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.bz2
opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.xz
Merge branch 'master' into cooptermination
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index ad79a9b..d483219 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1514,7 +1514,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1514 m_MaxScriptQueue = maxScriptQueue; 1514 m_MaxScriptQueue = maxScriptQueue;
1515 1515
1516 STPStartInfo startInfo = new STPStartInfo(); 1516 STPStartInfo startInfo = new STPStartInfo();
1517 startInfo.IdleTimeout = idleTimeout*1000; // convert to seconds as stated in .ini 1517 startInfo.ThreadPoolName = "XEngine";
1518 startInfo.IdleTimeout = idleTimeout * 1000; // convert to seconds as stated in .ini
1518 startInfo.MaxWorkerThreads = maxThreads; 1519 startInfo.MaxWorkerThreads = maxThreads;
1519 startInfo.MinWorkerThreads = minThreads; 1520 startInfo.MinWorkerThreads = minThreads;
1520 startInfo.ThreadPriority = threadPriority;; 1521 startInfo.ThreadPriority = threadPriority;;
@@ -1522,7 +1523,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1522 startInfo.StartSuspended = true; 1523 startInfo.StartSuspended = true;
1523 1524
1524 m_ThreadPool = new SmartThreadPool(startInfo); 1525 m_ThreadPool = new SmartThreadPool(startInfo);
1525 m_ThreadPool.Name = "XEngine";
1526 } 1526 }
1527 1527
1528 // 1528 //