diff options
| author | Melanie | 2009-10-22 07:02:21 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-22 07:02:21 +0100 |
| commit | b35fbe1f98532196befa8bc38deb0aba83d08f6f (patch) | |
| tree | 2aa3d6c6e8683dcce52709931c998b7e2bf1d42d /OpenSim/Region/Application | |
| parent | * Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to U... (diff) | |
| parent | Make the LSL scripting delays take full effect. To tune, tweat the (diff) | |
| download | opensim-SC-b35fbe1f98532196befa8bc38deb0aba83d08f6f.zip opensim-SC-b35fbe1f98532196befa8bc38deb0aba83d08f6f.tar.gz opensim-SC-b35fbe1f98532196befa8bc38deb0aba83d08f6f.tar.bz2 opensim-SC-b35fbe1f98532196befa8bc38deb0aba83d08f6f.tar.xz | |
Merge branch 'melanie_test' into prioritization
This makes SmartThreadPool configurable and also makes it the default, since
the regular thread pool simply stinks.
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 5be1816..c04b8c2 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -67,6 +67,8 @@ namespace OpenSim | |||
| 67 | 67 | ||
| 68 | IConfig startupConfig = m_config.Source.Configs["Startup"]; | 68 | IConfig startupConfig = m_config.Source.Configs["Startup"]; |
| 69 | 69 | ||
| 70 | Util.SetMaxThreads(startupConfig.GetInt("MaxPoolThreads", 15)); | ||
| 71 | |||
| 70 | if (startupConfig != null) | 72 | if (startupConfig != null) |
| 71 | { | 73 | { |
| 72 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt"); | 74 | m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt"); |