diff options
| author | Justin Clark-Casey (justincc) | 2014-11-21 02:16:56 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-11-25 23:23:11 +0000 |
| commit | b1fd0d35e5d2ea54b260418ef10aa8ef31d59f32 (patch) | |
| tree | a0ab67c6de250790e2ff4aa9a24dd7b0e07b286b /OpenSim/Region/Application | |
| parent | Add [Startup] JobEngineEnabled setting that allows the job engine to be disab... (diff) | |
| download | opensim-SC_OLD-b1fd0d35e5d2ea54b260418ef10aa8ef31d59f32.zip opensim-SC_OLD-b1fd0d35e5d2ea54b260418ef10aa8ef31d59f32.tar.gz opensim-SC_OLD-b1fd0d35e5d2ea54b260418ef10aa8ef31d59f32.tar.bz2 opensim-SC_OLD-b1fd0d35e5d2ea54b260418ef10aa8ef31d59f32.tar.xz | |
Make small adjustment to JobEngine default from previous commit to enable it when [Startup] section is not present (though this is extremely unlikely).
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 6a7291c..0f61faf 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -338,7 +338,7 @@ namespace OpenSim | |||
| 338 | // Called from base.StartUp() | 338 | // Called from base.StartUp() |
| 339 | 339 | ||
| 340 | IConfig startupConfig = Config.Configs["Startup"]; | 340 | IConfig startupConfig = Config.Configs["Startup"]; |
| 341 | if (startupConfig != null && startupConfig.GetBoolean("JobEngineEnabled", true)) | 341 | if (startupConfig == null || startupConfig.GetBoolean("JobEngineEnabled", true)) |
| 342 | Watchdog.JobEngine.Start(); | 342 | Watchdog.JobEngine.Start(); |
| 343 | 343 | ||
| 344 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 344 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |