diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs index ad79fbc..67cf0e2 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs | |||
@@ -3,6 +3,7 @@ using System.Collections.Generic; | |||
3 | using System.Text; | 3 | using System.Text; |
4 | using System.Threading; | 4 | using System.Threading; |
5 | using libsecondlife; | 5 | using libsecondlife; |
6 | using Nini.Config; | ||
6 | using OpenSim.Framework; | 7 | using OpenSim.Framework; |
7 | using OpenSim.Region.Environment.Scenes.Scripting; | 8 | using OpenSim.Region.Environment.Scenes.Scripting; |
8 | 9 | ||
@@ -16,7 +17,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
16 | /// <summary> | 17 | /// <summary> |
17 | /// How many ms to sleep if queue is empty | 18 | /// How many ms to sleep if queue is empty |
18 | /// </summary> | 19 | /// </summary> |
19 | private int nothingToDoSleepms = 50; | 20 | private int nothingToDoSleepms;// = 50; |
20 | 21 | ||
21 | public DateTime LastExecutionStarted; | 22 | public DateTime LastExecutionStarted; |
22 | public bool InExecution = false; | 23 | public bool InExecution = false; |
@@ -28,6 +29,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
28 | public EventQueueThreadClass(EventQueueManager eqm) | 29 | public EventQueueThreadClass(EventQueueManager eqm) |
29 | { | 30 | { |
30 | eventQueueManager = eqm; | 31 | eventQueueManager = eqm; |
32 | nothingToDoSleepms = eqm.m_ScriptEngine.ScriptConfigSource.GetInt("SleepTimeIfNoScriptExecutionMs", 50); | ||
31 | Start(); | 33 | Start(); |
32 | } | 34 | } |
33 | 35 | ||
@@ -183,7 +185,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
183 | } | 185 | } |
184 | catch (ThreadAbortException tae) | 186 | catch (ThreadAbortException tae) |
185 | { | 187 | { |
186 | throw tae; | 188 | eventQueueManager.m_ScriptEngine.Log.Notice("ScriptEngine", "ThreadAbortException while executing function."); |
187 | } | 189 | } |
188 | catch (Exception e) | 190 | catch (Exception e) |
189 | { | 191 | { |