aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
diff options
context:
space:
mode:
authorMelanie2013-01-23 02:38:59 +0000
committerMelanie2013-01-23 02:38:59 +0000
commitcc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad (patch)
tree0854a68c0329c37b9eedea56b3bf65458c59b696 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
parentMerge branch 'master' into careminster (diff)
parentBulletSim: Tweeks to vehicle motion. (diff)
downloadopensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.zip
opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.gz
opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.bz2
opensim-SC-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-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 2065a46..816d8ba 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1574,7 +1574,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1574 m_MaxScriptQueue = maxScriptQueue; 1574 m_MaxScriptQueue = maxScriptQueue;
1575 1575
1576 STPStartInfo startInfo = new STPStartInfo(); 1576 STPStartInfo startInfo = new STPStartInfo();
1577 startInfo.IdleTimeout = idleTimeout*1000; // convert to seconds as stated in .ini 1577 startInfo.ThreadPoolName = "XEngine";
1578 startInfo.IdleTimeout = idleTimeout * 1000; // convert to seconds as stated in .ini
1578 startInfo.MaxWorkerThreads = maxThreads; 1579 startInfo.MaxWorkerThreads = maxThreads;
1579 startInfo.MinWorkerThreads = minThreads; 1580 startInfo.MinWorkerThreads = minThreads;
1580 startInfo.ThreadPriority = threadPriority;; 1581 startInfo.ThreadPriority = threadPriority;;
@@ -1582,7 +1583,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1582 startInfo.StartSuspended = true; 1583 startInfo.StartSuspended = true;
1583 1584
1584 m_ThreadPool = new SmartThreadPool(startInfo); 1585 m_ThreadPool = new SmartThreadPool(startInfo);
1585 m_ThreadPool.Name = "XEngine";
1586 } 1586 }
1587 1587
1588 // 1588 //