diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs index 3775372..799005c 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs | |||
@@ -28,7 +28,9 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Runtime.Remoting.Lifetime; | 30 | using System.Runtime.Remoting.Lifetime; |
31 | using OpenSim.Region.ScriptEngine.XEngine.Script; | 31 | using OpenSim.Region.ScriptEngine.Shared; |
32 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | ||
33 | using OpenSim.Region.ScriptEngine.Interfaces; | ||
32 | 34 | ||
33 | namespace OpenSim.Region.ScriptEngine.XEngine | 35 | namespace OpenSim.Region.ScriptEngine.XEngine |
34 | { | 36 | { |
@@ -117,23 +119,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
117 | /// </summary> | 119 | /// </summary> |
118 | /// <param name="FunctionName">Name of function to execute</param> | 120 | /// <param name="FunctionName">Name of function to execute</param> |
119 | /// <param name="args">Arguments to pass to function</param> | 121 | /// <param name="args">Arguments to pass to function</param> |
120 | public void ExecuteEvent(string FunctionName, object[] args) | 122 | public void ExecuteEvent(string state, string FunctionName, object[] args) |
121 | { | 123 | { |
122 | DoExecuteEvent(FunctionName, args); | 124 | DoExecuteEvent(state, FunctionName, args); |
123 | } | 125 | } |
124 | 126 | ||
125 | protected abstract void DoExecuteEvent(string FunctionName, object[] args); | 127 | protected abstract void DoExecuteEvent(string state, string FunctionName, object[] args); |
126 | 128 | ||
127 | /// <summary> | 129 | /// <summary> |
128 | /// Compute the events handled by the current state of the script | 130 | /// Compute the events handled by the current state of the script |
129 | /// </summary> | 131 | /// </summary> |
130 | /// <returns>state mask</returns> | 132 | /// <returns>state mask</returns> |
131 | public scriptEvents GetStateEventFlags() | 133 | public scriptEvents GetStateEventFlags(string state) |
132 | { | 134 | { |
133 | return DoGetStateEventFlags(); | 135 | return DoGetStateEventFlags(state); |
134 | } | 136 | } |
135 | 137 | ||
136 | protected abstract scriptEvents DoGetStateEventFlags(); | 138 | protected abstract scriptEvents DoGetStateEventFlags(string state); |
137 | 139 | ||
138 | protected void initEventFlags() | 140 | protected void initEventFlags() |
139 | { | 141 | { |