aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs22
1 files changed, 13 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
index d77f698..30b3e8f 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueThreadClass.cs
@@ -272,15 +272,19 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
272 // + ", QIS.functionName: " + 272 // + ", QIS.functionName: " +
273 // QIS.functionName); 273 // QIS.functionName);
274#endif 274#endif
275 LastExecutionStarted = DateTime.Now.Ticks; 275 // Only pipe event if land supports it.
276 KillCurrentScript = false; 276 if (m_ScriptEngine.World.pipeEventsForScript(QIS.localID))
277 InExecution = true; 277 {
278 m_ScriptEngine.m_ScriptManager.ExecuteEvent(QIS.localID, 278 LastExecutionStarted = DateTime.Now.Ticks;
279 QIS.itemID, 279 KillCurrentScript = false;
280 QIS.functionName, 280 InExecution = true;
281 QIS.llDetectParams, 281 m_ScriptEngine.m_ScriptManager.ExecuteEvent(QIS.localID,
282 QIS.param); 282 QIS.itemID,
283 InExecution = false; 283 QIS.functionName,
284 QIS.llDetectParams,
285 QIS.param);
286 InExecution = false;
287 }
284 } 288 }
285 catch (Exception e) 289 catch (Exception e)
286 { 290 {