diff options
author | Jeff Ames | 2008-02-20 18:38:20 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-20 18:38:20 +0000 |
commit | a8cfbbe963529728acbab4d9936cb89af380d1ac (patch) | |
tree | 16a72fba3d15556f6702127e7cfb98aa9fb9cf81 /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |
parent | Fix exception when reading OpenSim.ini file. (diff) | |
download | opensim-SC-a8cfbbe963529728acbab4d9936cb89af380d1ac.zip opensim-SC-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.gz opensim-SC-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.bz2 opensim-SC-a8cfbbe963529728acbab4d9936cb89af380d1ac.tar.xz |
Minor cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs index ab4ea04..47446a3 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs | |||
@@ -130,9 +130,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
130 | 130 | ||
131 | if (m_ScriptEngine != null) | 131 | if (m_ScriptEngine != null) |
132 | { | 132 | { |
133 | // | ||
134 | // Re-reading config every x seconds | 133 | // Re-reading config every x seconds |
135 | // | ||
136 | if (m_ScriptEngine.RefreshConfigFilens > 0) | 134 | if (m_ScriptEngine.RefreshConfigFilens > 0) |
137 | { | 135 | { |
138 | // Check if its time to re-read config | 136 | // Check if its time to re-read config |
@@ -145,15 +143,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
145 | } | 143 | } |
146 | } | 144 | } |
147 | 145 | ||
148 | // | ||
149 | // Adjust number of running script threads if not correct | 146 | // Adjust number of running script threads if not correct |
150 | // | ||
151 | if (m_ScriptEngine.m_EventQueueManager != null) | 147 | if (m_ScriptEngine.m_EventQueueManager != null) |
152 | m_ScriptEngine.m_EventQueueManager.AdjustNumberOfScriptThreads(); | 148 | m_ScriptEngine.m_EventQueueManager.AdjustNumberOfScriptThreads(); |
153 | 149 | ||
154 | // | ||
155 | // Check if any script has exceeded its max execution time | 150 | // Check if any script has exceeded its max execution time |
156 | // | ||
157 | if (m_ScriptEngine.m_EventQueueManager != null && m_ScriptEngine.m_EventQueueManager.EnforceMaxExecutionTime) | 151 | if (m_ScriptEngine.m_EventQueueManager != null && m_ScriptEngine.m_EventQueueManager.EnforceMaxExecutionTime) |
158 | { | 152 | { |
159 | // We are enforcing execution time | 153 | // We are enforcing execution time |
@@ -165,7 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
165 | Last_maxFunctionExecutionTimens = DateTime.Now.Ticks; // Reset time | 159 | Last_maxFunctionExecutionTimens = DateTime.Now.Ticks; // Reset time |
166 | } | 160 | } |
167 | } | 161 | } |
168 | } // m_ScriptEngine != null | 162 | } |
169 | } | 163 | } |
170 | } | 164 | } |
171 | catch (Exception ex) | 165 | catch (Exception ex) |