diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index c528c02..cfe0599 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -863,7 +863,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
863 | private LLUUID m_ObjectID; | 863 | private LLUUID m_ObjectID; |
864 | private LLUUID m_AssetID; | 864 | private LLUUID m_AssetID; |
865 | private IScript m_Script; | 865 | private IScript m_Script; |
866 | private Executor m_Executor; | ||
867 | private LLUUID m_AppDomain; | 866 | private LLUUID m_AppDomain; |
868 | private DetectParams[] m_DetectParams; | 867 | private DetectParams[] m_DetectParams; |
869 | private bool m_TimerQueued; | 868 | private bool m_TimerQueued; |
@@ -1009,12 +1008,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1009 | m_Script.InitApi(kv.Key, kv.Value); | 1008 | m_Script.InitApi(kv.Key, kv.Value); |
1010 | } | 1009 | } |
1011 | 1010 | ||
1012 | m_Executor = new Executor(m_Script); | ||
1013 | |||
1014 | // m_Engine.Log.Debug("[XEngine] Script instance created"); | 1011 | // m_Engine.Log.Debug("[XEngine] Script instance created"); |
1015 | 1012 | ||
1016 | part.SetScriptEvents(m_ItemID, | 1013 | part.SetScriptEvents(m_ItemID, |
1017 | (int)m_Executor.GetStateEventFlags(State)); | 1014 | (int)m_Script.GetStateEventFlags(State)); |
1018 | } | 1015 | } |
1019 | catch (Exception e) | 1016 | catch (Exception e) |
1020 | { | 1017 | { |
@@ -1274,7 +1271,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1274 | if (part != null) | 1271 | if (part != null) |
1275 | { | 1272 | { |
1276 | part.SetScriptEvents(m_ItemID, | 1273 | part.SetScriptEvents(m_ItemID, |
1277 | (int)m_Executor.GetStateEventFlags(State)); | 1274 | (int)m_Script.GetStateEventFlags(State)); |
1278 | } | 1275 | } |
1279 | } | 1276 | } |
1280 | else | 1277 | else |
@@ -1290,7 +1287,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1290 | m_EventStart = DateTime.Now; | 1287 | m_EventStart = DateTime.Now; |
1291 | m_InEvent = true; | 1288 | m_InEvent = true; |
1292 | 1289 | ||
1293 | m_Executor.ExecuteEvent(State, data.EventName, data.Params); | 1290 | m_Script.ExecuteEvent(State, data.EventName, data.Params); |
1294 | 1291 | ||
1295 | m_InEvent = false; | 1292 | m_InEvent = false; |
1296 | m_CurrentEvent = String.Empty; | 1293 | m_CurrentEvent = String.Empty; |