From 59b38f842af4a1ad81e24b132948481e75004d6d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 21 Nov 2014 01:44:30 +0000
Subject: Add [Startup] JobEngineEnabled setting that allows the job engine to
 be disabled for testing purposes if necessary.

---
 OpenSim/Region/Application/OpenSimBase.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Application')

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;
-- 
cgit v1.1