diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs index cc78b51..e55abb7 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | ||
30 | using OpenMetaverse; | 31 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
32 | using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney; | 33 | using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney; |
@@ -35,6 +36,7 @@ using OpenSim.Region; | |||
35 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
36 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.ScriptEngine.Shared; | 38 | using OpenSim.Region.ScriptEngine.Shared; |
39 | using log4net; | ||
38 | 40 | ||
39 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 41 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
40 | { | 42 | { |
@@ -63,6 +65,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
63 | // verify what exact parameters are needed. | 65 | // verify what exact parameters are needed. |
64 | // | 66 | // |
65 | 67 | ||
68 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
69 | |||
66 | private ScriptEngine myScriptEngine; | 70 | private ScriptEngine myScriptEngine; |
67 | 71 | ||
68 | public EventManager(ScriptEngine _ScriptEngine, bool performHookUp) | 72 | public EventManager(ScriptEngine _ScriptEngine, bool performHookUp) |
@@ -78,8 +82,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
78 | 82 | ||
79 | public void HookUpEvents() | 83 | public void HookUpEvents() |
80 | { | 84 | { |
81 | myScriptEngine.Log.Info("[" + myScriptEngine.ScriptEngineName + | 85 | m_log.Info("[" + myScriptEngine.ScriptEngineName + |
82 | "]: Hooking up to server events"); | 86 | "]: Hooking up to server events"); |
83 | 87 | ||
84 | myScriptEngine.World.EventManager.OnObjectGrab += | 88 | myScriptEngine.World.EventManager.OnObjectGrab += |
85 | touch_start; | 89 | touch_start; |
@@ -293,9 +297,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
293 | if (engine != myScriptEngine.ScriptEngineName) | 297 | if (engine != myScriptEngine.ScriptEngineName) |
294 | return; | 298 | return; |
295 | 299 | ||
296 | myScriptEngine.Log.Debug("OnRezScript localID: " + localID + | 300 | m_log.Debug("OnRezScript localID: " + localID + |
297 | " LLUID: " + itemID.ToString() + " Size: " + | 301 | " LLUID: " + itemID.ToString() + " Size: " + |
298 | script.Length); | 302 | script.Length); |
299 | 303 | ||
300 | myScriptEngine.m_ScriptManager.StartScript(localID, itemID, script, | 304 | myScriptEngine.m_ScriptManager.StartScript(localID, itemID, script, |
301 | startParam, postOnRez); | 305 | startParam, postOnRez); |
@@ -303,7 +307,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
303 | 307 | ||
304 | public void OnRemoveScript(uint localID, UUID itemID) | 308 | public void OnRemoveScript(uint localID, UUID itemID) |
305 | { | 309 | { |
306 | myScriptEngine.Log.Debug("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString()); | 310 | m_log.Debug("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString()); |
307 | myScriptEngine.m_ScriptManager.StopScript( | 311 | myScriptEngine.m_ScriptManager.StopScript( |
308 | localID, | 312 | localID, |
309 | itemID | 313 | itemID |