diff options
author | Jeff Ames | 2008-02-05 19:44:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-05 19:44:27 +0000 |
commit | 6ed5283bc06a62f38eb517e67b975832b603bf61 (patch) | |
tree | e5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs | |
parent | Cut down on the number of packets sent during terraforming. Terraforming shou... (diff) | |
download | opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.zip opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2 opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz |
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O.
This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to 'OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs')
-rw-r--r-- | OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs index 3a1ae5a..3aa2216 100644 --- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs +++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs | |||
@@ -38,17 +38,19 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
38 | [Serializable] | 38 | [Serializable] |
39 | internal class EventManager | 39 | internal class EventManager |
40 | { | 40 | { |
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | |||
41 | private ScriptEngine myScriptEngine; | 43 | private ScriptEngine myScriptEngine; |
42 | //public IScriptHost TEMP_OBJECT_ID; | 44 | //public IScriptHost TEMP_OBJECT_ID; |
43 | public EventManager(ScriptEngine _ScriptEngine) | 45 | public EventManager(ScriptEngine _ScriptEngine) |
44 | { | 46 | { |
45 | myScriptEngine = _ScriptEngine; | 47 | myScriptEngine = _ScriptEngine; |
46 | // TODO: HOOK EVENTS UP TO SERVER! | 48 | // TODO: HOOK EVENTS UP TO SERVER! |
47 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Start"); | 49 | //myScriptEngine.m_log.Info("[ScriptEngine]: EventManager Start"); |
48 | // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager | 50 | // TODO: ADD SERVER HOOK TO LOAD A SCRIPT THROUGH myScriptEngine.ScriptManager |
49 | 51 | ||
50 | // Hook up a test event to our test form | 52 | // Hook up a test event to our test form |
51 | myScriptEngine.Log.Verbose("ScriptEngine", "Hooking up to server events"); | 53 | myScriptEngine.m_log.Info("[ScriptEngine]: Hooking up to server events"); |
52 | myScriptEngine.World.EventManager.OnObjectGrab += touch_start; | 54 | myScriptEngine.World.EventManager.OnObjectGrab += touch_start; |
53 | myScriptEngine.World.EventManager.OnRezScript += OnRezScript; | 55 | myScriptEngine.World.EventManager.OnRezScript += OnRezScript; |
54 | myScriptEngine.World.EventManager.OnRemoveScript += OnRemoveScript; | 56 | myScriptEngine.World.EventManager.OnRemoveScript += OnRemoveScript; |
@@ -57,7 +59,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine | |||
57 | public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 59 | public void touch_start(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) |
58 | { | 60 | { |
59 | // Add to queue for all scripts in ObjectID object | 61 | // Add to queue for all scripts in ObjectID object |
60 | //myScriptEngine.m_logger.Verbose("ScriptEngine", "EventManager Event: touch_start"); | 62 | //myScriptEngine.m_log.Info("[ScriptEngine]: EventManager Event: touch_start"); |
61 | //Console.WriteLine("touch_start localID: " + localID); | 63 | //Console.WriteLine("touch_start localID: " + localID); |
62 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "touch_start", new object[] {(int) 1}); | 64 | myScriptEngine.m_EventQueueManager.AddToObjectQueue(localID, "touch_start", new object[] {(int) 1}); |
63 | } | 65 | } |