From e5db6a75d02cf057dad316f5707f69fcbfbb0b1a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 26 Sep 2008 17:59:36 +0000
Subject: Finishing the code cleanup in DNE, make llDie work again in DNE. Add
some compile messages from XEngine into DNE as well.
---
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index fca4617..b593894 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -439,13 +439,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
#region Perform event execution in script
- ///
- /// Execute a LL-event-function in Script
- ///
- /// Object the script is located in
- /// Script ID
- /// Name of function
- /// Arguments to pass to function
+ // Execute a LL-event-function in Script
internal void ExecuteEvent(uint localID, UUID itemID,
string FunctionName, DetectParams[] qParams, object[] args)
{
@@ -454,8 +448,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
return;
detparms[id] = qParams;
+
if (id.Running)
id.Script.ExecuteEvent(id.State, FunctionName, args);
+
detparms.Remove(id);
}
--
cgit v1.1