diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 4 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 20401f1..6a7291c 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -337,7 +337,9 @@ namespace OpenSim | |||
337 | { | 337 | { |
338 | // Called from base.StartUp() | 338 | // Called from base.StartUp() |
339 | 339 | ||
340 | Watchdog.JobEngine.Start(); | 340 | IConfig startupConfig = Config.Configs["Startup"]; |
341 | if (startupConfig != null && startupConfig.GetBoolean("JobEngineEnabled", true)) | ||
342 | Watchdog.JobEngine.Start(); | ||
341 | 343 | ||
342 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 344 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |
343 | SceneManager.OnRestartSim += HandleRestartRegion; | 345 | SceneManager.OnRestartSim += HandleRestartRegion; |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e89fa0a..3e9514e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -67,6 +67,10 @@ | |||
67 | ; when running with the SmartThreadPool option above | 67 | ; when running with the SmartThreadPool option above |
68 | MaxPoolThreads = 300 | 68 | MaxPoolThreads = 300 |
69 | 69 | ||
70 | ; Allow certain jobs to be run consecutively in a job engine rather than always concurrently. | ||
71 | ; This improves performance in regions with large numbers of connections (in the hundreds). | ||
72 | JobEngineEnabled = true | ||
73 | |||
70 | ; Plugin Registry Location | 74 | ; Plugin Registry Location |
71 | ; Set path to directory for plugin registry. Information about the | 75 | ; Set path to directory for plugin registry. Information about the |
72 | ; registered repositories and installed plugins will be stored here. | 76 | ; registered repositories and installed plugins will be stored here. |