diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 99f61cd..32e1df1 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -31,13 +31,14 @@ using log4net; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Scenes; | 33 | using OpenSim.Region.Environment.Scenes; |
34 | using OpenSim.Region.ScriptEngine.Common; | 34 | using OpenSim.Region.ScriptEngine.Interfaces; |
35 | using OpenSim.Region.ScriptEngine.Shared; | 35 | using OpenSim.Region.ScriptEngine.Shared; |
36 | using OpenSim.Region.ScriptEngine.Shared.Api; | 36 | using OpenSim.Region.ScriptEngine.Shared.Api; |
37 | using System.Collections.Generic; | 37 | using System.Collections.Generic; |
38 | using System.IO; | 38 | using System.IO; |
39 | using System.Runtime.Serialization.Formatters.Binary; | 39 | using System.Runtime.Serialization.Formatters.Binary; |
40 | using System.Threading; | 40 | using System.Threading; |
41 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | ||
41 | 42 | ||
42 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 43 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
43 | { | 44 | { |
@@ -446,7 +447,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
446 | 447 | ||
447 | detparms[id] = qParams; | 448 | detparms[id] = qParams; |
448 | if (id.Running) | 449 | if (id.Running) |
449 | id.Script.Exec.ExecuteEvent(id.State, FunctionName, args); | 450 | id.Script.ExecuteEvent(id.State, FunctionName, args); |
450 | detparms.Remove(id); | 451 | detparms.Remove(id); |
451 | } | 452 | } |
452 | 453 | ||
@@ -470,8 +471,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
470 | { | 471 | { |
471 | return 0; | 472 | return 0; |
472 | } | 473 | } |
473 | ExecutorBase.scriptEvents evflags = | 474 | int evflags = id.Script.GetStateEventFlags(id.State); |
474 | id.Script.Exec.GetStateEventFlags(id.State); | 475 | |
475 | return (int)evflags; | 476 | return (int)evflags; |
476 | } | 477 | } |
477 | catch (Exception) | 478 | catch (Exception) |