diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index 5c9f76d..0911afb 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |||
@@ -156,12 +156,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
156 | m_ScriptEngine.m_EventQueueManager.AdjustNumberOfScriptThreads(); | 156 | m_ScriptEngine.m_EventQueueManager.AdjustNumberOfScriptThreads(); |
157 | 157 | ||
158 | // Check if any script has exceeded its max execution time | 158 | // Check if any script has exceeded its max execution time |
159 | if (m_ScriptEngine.m_EventQueueManager != null && | 159 | if (EventQueueManager.EnforceMaxExecutionTime) |
160 | m_ScriptEngine.m_EventQueueManager.EnforceMaxExecutionTime) | ||
161 | { | 160 | { |
162 | // We are enforcing execution time | 161 | // We are enforcing execution time |
163 | if (DateTime.Now.Ticks - Last_maxFunctionExecutionTimens > | 162 | if (DateTime.Now.Ticks - Last_maxFunctionExecutionTimens > |
164 | m_ScriptEngine.m_EventQueueManager.maxFunctionExecutionTimens) | 163 | EventQueueManager.maxFunctionExecutionTimens) |
165 | { | 164 | { |
166 | // Its time to check again | 165 | // Its time to check again |
167 | m_ScriptEngine.m_EventQueueManager.CheckScriptMaxExecTime(); // Do check | 166 | m_ScriptEngine.m_EventQueueManager.CheckScriptMaxExecTime(); // Do check |