aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-26 17:59:36 +0000
committerMelanie Thielker2008-09-26 17:59:36 +0000
commite5db6a75d02cf057dad316f5707f69fcbfbb0b1a (patch)
tree36ab19d3b220e4bf7603057610b539a322b57a11 /OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
parent* Patch from JHurliman (diff)
downloadopensim-SC-e5db6a75d02cf057dad316f5707f69fcbfbb0b1a.zip
opensim-SC-e5db6a75d02cf057dad316f5707f69fcbfbb0b1a.tar.gz
opensim-SC-e5db6a75d02cf057dad316f5707f69fcbfbb0b1a.tar.bz2
opensim-SC-e5db6a75d02cf057dad316f5707f69fcbfbb0b1a.tar.xz
Finishing the code cleanup in DNE, make llDie work again in DNE.
Add some compile messages from XEngine into DNE as well.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs10
1 files changed, 3 insertions, 7 deletions
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
439 439
440 #region Perform event execution in script 440 #region Perform event execution in script
441 441
442 /// <summary> 442 // Execute a LL-event-function in Script
443 /// Execute a LL-event-function in Script
444 /// </summary>
445 /// <param name="localID">Object the script is located in</param>
446 /// <param name="itemID">Script ID</param>
447 /// <param name="FunctionName">Name of function</param>
448 /// <param name="args">Arguments to pass to function</param>
449 internal void ExecuteEvent(uint localID, UUID itemID, 443 internal void ExecuteEvent(uint localID, UUID itemID,
450 string FunctionName, DetectParams[] qParams, object[] args) 444 string FunctionName, DetectParams[] qParams, object[] args)
451 { 445 {
@@ -454,8 +448,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
454 return; 448 return;
455 449
456 detparms[id] = qParams; 450 detparms[id] = qParams;
451
457 if (id.Running) 452 if (id.Running)
458 id.Script.ExecuteEvent(id.State, FunctionName, args); 453 id.Script.ExecuteEvent(id.State, FunctionName, args);
454
459 detparms.Remove(id); 455 detparms.Remove(id);
460 } 456 }
461 457