2 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 2ebc8b7..bb79da4 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -112,10 +112,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
         /// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY.
         /// </summary>
         public static long maxFunctionExecutionTimens;
+        
         /// <summary>
         /// Enforce max execution time
         /// </summary>
         public static bool EnforceMaxExecutionTime;
+        
         /// <summary>
         /// Kill script (unload) when it exceeds execution time
         /// </summary>
@@ -163,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             // Refresh config
             numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2);
             maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000);
-            EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", false);
+            EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", true);
             KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false);
             EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300);
 
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index bdf80c6..c2b07fc 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
 
         public void ReadConfig()
         {
-            RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30);
+            RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0);
 
             if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig();
             if (m_EventManager != null) m_EventManager.ReadConfig();