6 files changed, 20 insertions, 13 deletions

diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
index deb289f..43049fc 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/CSharp/CSharpScriptEngine.cs
@@ -28,14 +28,15 @@
 using System;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using Microsoft.CSharp;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.ExtensionsScriptModule.CSharp
 {
     public class CSharpScriptEngine : IScriptCompiler
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public string FileExt()
         {
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
index f5689cb..52afe3f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JScript/JScriptEngine.cs
@@ -28,14 +28,15 @@
 using System;
 using System.CodeDom.Compiler;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using Microsoft.JScript;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.ExtensionsScriptModule.JScript
 {
     public class JScriptEngine : IScriptCompiler
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public string FileExt()
         {
diff --git a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
index 16c6e79..efd01e9 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Engines/JVMEngine/JVM/Interpreter.Methods.cs
@@ -25,6 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+
 namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
 {
     partial class Thread
@@ -46,8 +48,8 @@ namespace OpenSim.Region.ExtensionsScriptModule.JVMEngine.JVM
                             string typ =
                                 ((ClassRecord.PoolMethodRef) m_thread.currentClass.m_constantsPool[refIndex - 1]).
                                     mNameType.Type.Value;
-                            string typeparam = System.String.Empty;
-                            string typereturn = System.String.Empty;
+                            string typeparam = String.Empty;
+                            string typereturn = String.Empty;
                             int firstbrak = 0;
                             int secondbrak = 0;
                             firstbrak = typ.LastIndexOf('(');
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
index 428192f..16c449f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInfo.cs
@@ -25,8 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Reflection;
 using libsecondlife;
-using OpenSim.Framework.Console;
+using log4net;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.ExtensionsScriptModule
@@ -36,7 +37,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
     /// </summary>
     public class ScriptInfo
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // Reference to world.eventsManager provided for convenience
         public EventManager events;
@@ -47,7 +48,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
         // API Access
         public ScriptAPI api;
 
-        public log4net.ILog Log
+        public ILog Log
         {
             get { return m_log; }
         }
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
index d0a0e86..a11fb0f 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptInterpretedAPI.cs
@@ -26,9 +26,10 @@
  */
 
 using System;
+using System.Reflection;
 using System.Text;
 using Axiom.Math;
-using OpenSim.Framework.Console;
+using log4net;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using Key = libsecondlife.LLUUID;
@@ -44,7 +45,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
     /// <remarks>Avoid at all costs. This should ONLY be used for LSL.</remarks>
     internal class ScriptInterpretedAPI
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected Key m_object;
         protected Scene m_scene;
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index 9edc6dc..8c11f7a 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -26,8 +26,9 @@
  */
 
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using Nini.Config;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.ExtensionsScriptModule.CSharp;
@@ -38,7 +39,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
 {
     public class ScriptManager : IRegionModule, IExtensionScriptModule
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly List<IScript> scripts = new List<IScript>();
         private Scene m_scene;