diff options
| author | Justin Clark-Casey (justincc) | 2014-11-21 01:44:30 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-11-25 23:23:11 +0000 |
| commit | 59b38f842af4a1ad81e24b132948481e75004d6d (patch) | |
| tree | f1b7e7262595bb4d80d3192a40c98ecd84012360 /OpenSim/Region/Application | |
| parent | Move conditionals which control whether a task is placed in the JobEngine ins... (diff) | |
| download | opensim-SC_OLD-59b38f842af4a1ad81e24b132948481e75004d6d.zip opensim-SC_OLD-59b38f842af4a1ad81e24b132948481e75004d6d.tar.gz opensim-SC_OLD-59b38f842af4a1ad81e24b132948481e75004d6d.tar.bz2 opensim-SC_OLD-59b38f842af4a1ad81e24b132948481e75004d6d.tar.xz | |
Add [Startup] JobEngineEnabled setting that allows the job engine to be disabled for testing purposes if necessary.
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 4 |
1 files changed, 3 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; |