diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs | 4 |
1 files changed, 3 insertions, 1 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 | |||
112 | /// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY. | 112 | /// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY. |
113 | /// </summary> | 113 | /// </summary> |
114 | public static long maxFunctionExecutionTimens; | 114 | public static long maxFunctionExecutionTimens; |
115 | |||
115 | /// <summary> | 116 | /// <summary> |
116 | /// Enforce max execution time | 117 | /// Enforce max execution time |
117 | /// </summary> | 118 | /// </summary> |
118 | public static bool EnforceMaxExecutionTime; | 119 | public static bool EnforceMaxExecutionTime; |
120 | |||
119 | /// <summary> | 121 | /// <summary> |
120 | /// Kill script (unload) when it exceeds execution time | 122 | /// Kill script (unload) when it exceeds execution time |
121 | /// </summary> | 123 | /// </summary> |
@@ -163,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
163 | // Refresh config | 165 | // Refresh config |
164 | numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2); | 166 | numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2); |
165 | maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000); | 167 | maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000); |
166 | EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", false); | 168 | EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", true); |
167 | KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false); | 169 | KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false); |
168 | EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300); | 170 | EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300); |
169 | 171 | ||