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
         {
             // 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;
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 @@
     ; when running with the SmartThreadPool option above
     MaxPoolThreads = 300
 
+    ; Allow certain jobs to be run consecutively in a job engine rather than always concurrently.
+    ; This improves performance in regions with large numbers of connections (in the hundreds).
+    JobEngineEnabled = true
+
     ; Plugin Registry Location
     ; Set path to directory for plugin registry. Information about the 
     ; registered repositories and installed plugins will be stored here.