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
         {
             // Called from base.StartUp()
 
-            Watchdog.JobEngine.Start();
+            IConfig startupConfig = Config.Configs["Startup"];
+            if (startupConfig != null && startupConfig.GetBoolean("JobEngineEnabled", true))
+                Watchdog.JobEngine.Start();
 
             m_httpServerPort = m_networkServersInfo.HttpListenerPort;
             SceneManager.OnRestartSim += HandleRestartRegion;