Refactor log4net logger handling in script engine. (#3148)

2 files changed, 6 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 2632948..b1b82e5 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney;
@@ -35,6 +36,7 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Interfaces;
+using log4net;
 
 namespace OpenSim.Region.ScriptEngine.XEngine
 {
@@ -43,13 +45,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
     /// </summary>
     public class EventManager
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private XEngine myScriptEngine;
 
         public EventManager(XEngine _ScriptEngine)
         {
             myScriptEngine = _ScriptEngine;
 
-            myScriptEngine.Log.Info("[XEngine] Hooking up to server events");
+            m_log.Info("[XEngine] Hooking up to server events");
             myScriptEngine.World.EventManager.OnObjectGrab += touch_start;
             myScriptEngine.World.EventManager.OnObjectDeGrab += touch_end;
             myScriptEngine.World.EventManager.OnScriptChangedEvent += changed;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 7a36bc2..75d0bec 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -125,11 +125,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             get { return m_Scene; }
         }
 
-        public ILog Log
-        {
-            get { return m_log; }
-        }
-
         public static List<XEngine> ScriptEngines
         {
             get { return m_ScriptEngines; }
@@ -483,7 +478,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
             if (part == null)
             {
-                Log.Error("[Script] SceneObjectPart unavailable. Script NOT started.");
+                m_log.Error("[Script] SceneObjectPart unavailable. Script NOT started.");
                 m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n";
                 m_ScriptFailCount++;
                 return false;