diff options
author | Justin Clark-Casey (justincc) | 2013-01-24 00:02:43 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-24 00:02:43 +0000 |
commit | a1f78ceb37dda544f8d04aa00bf3fedd298f024e (patch) | |
tree | e3f9b4f03f712dc63a4aefc5ac389f9b1c36ed8d /OpenSim/Region/ScriptEngine/XEngine | |
parent | New constants for llGetObjectDetails (diff) | |
parent | BulletSim: remove setting of vehicle InterpolationRotationalVelocity. (diff) | |
download | opensim-SC_OLD-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.zip opensim-SC_OLD-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.gz opensim-SC_OLD-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.bz2 opensim-SC_OLD-a1f78ceb37dda544f8d04aa00bf3fedd298f024e.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index a17a018..72646f6 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1486,7 +1486,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1486 | m_MaxScriptQueue = maxScriptQueue; | 1486 | m_MaxScriptQueue = maxScriptQueue; |
1487 | 1487 | ||
1488 | STPStartInfo startInfo = new STPStartInfo(); | 1488 | STPStartInfo startInfo = new STPStartInfo(); |
1489 | startInfo.IdleTimeout = idleTimeout*1000; // convert to seconds as stated in .ini | 1489 | startInfo.ThreadPoolName = "XEngine"; |
1490 | startInfo.IdleTimeout = idleTimeout * 1000; // convert to seconds as stated in .ini | ||
1490 | startInfo.MaxWorkerThreads = maxThreads; | 1491 | startInfo.MaxWorkerThreads = maxThreads; |
1491 | startInfo.MinWorkerThreads = minThreads; | 1492 | startInfo.MinWorkerThreads = minThreads; |
1492 | startInfo.ThreadPriority = threadPriority;; | 1493 | startInfo.ThreadPriority = threadPriority;; |
@@ -1494,7 +1495,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1494 | startInfo.StartSuspended = true; | 1495 | startInfo.StartSuspended = true; |
1495 | 1496 | ||
1496 | m_ThreadPool = new SmartThreadPool(startInfo); | 1497 | m_ThreadPool = new SmartThreadPool(startInfo); |
1497 | m_ThreadPool.Name = "XEngine"; | ||
1498 | } | 1498 | } |
1499 | 1499 | ||
1500 | // | 1500 | // |