18 files changed, 71 insertions, 86 deletions

diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
index 75d4870..fe9c8e7 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
@@ -25,11 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
 using System.Xml;
 using libsecondlife;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.Environment.Scenes
 {
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
index 750129b..8f29507 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs
@@ -26,11 +26,11 @@
  */
 
 using System;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             m_scenePresenceID = new LLUUID((Guid)info.GetValue("m_scenePresenceID", typeof(Guid)));
@@ -182,7 +182,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             info.AddValue("m_scenePresenceID", m_scenePresenceID.UUID);
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 438118f..1faba9a 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -25,13 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Collections.Generic;
-using Axiom.Math;
-using libsecondlife;
-
 using System;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
+using Axiom.Math;
+using libsecondlife;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -145,7 +143,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             m_uuid = new LLUUID((Guid)info.GetValue("m_uuid", typeof(Guid)));
@@ -188,7 +186,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             info.AddValue("m_uuid", m_uuid.UUID);
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 8894db0..329f900 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -27,11 +27,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Types;
 using OpenSim.Region.Physics.Manager;
 
@@ -41,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
 
     public class InnerScene
     {
-        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);
 
         #region Events
 
@@ -295,7 +296,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot)
         {
-            System.Console.WriteLine("Attaching object " + objectLocalID + " to " + AttachmentPt);
+            Console.WriteLine("Attaching object " + objectLocalID + " to " + AttachmentPt);
             SceneObjectPart p = GetSceneObjectPart(objectLocalID);
             if (p != null)
             {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 2db9242..c5a1be1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -27,23 +27,21 @@
 
 using System;
 using System.Collections.Generic;
-using Axiom.Math;
+using System.Reflection;
+using System.Text;
 using libsecondlife;
 using libsecondlife.Packets;
+using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
-using System.IO;
-using System.Text;
-using System.Xml;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
     public partial class Scene
     {
-        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);
 
         /// <summary>
         /// Start all the scripts in the scene which should be started.
@@ -454,7 +452,7 @@ namespace OpenSim.Region.Environment.Scenes
                 InventoryItemBase item = userInfo.RootFolder.HasItem(itemID);
                 if (item != null)
                 {
-                    if (newName != System.String.Empty)
+                    if (newName != String.Empty)
                     {
                         item.Name = newName;
                     }
@@ -1014,7 +1012,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,
                                     uint ItemFlags, uint NextOwnerMask)
         {
-            System.Console.WriteLine("RezSingleAttachment: unimplemented yet");
+            Console.WriteLine("RezSingleAttachment: unimplemented yet");
         }
     }
 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 7e2c9ff..8fdb468 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -29,8 +29,6 @@ using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.UserManagement;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.Environment.Scenes
 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a3f6948..6d8d481 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -40,11 +40,12 @@ using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Modules.Terrain;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
-using Caps = OpenSim.Region.Capabilities.Caps;
-using Image = System.Drawing.Image;
-using Timer = System.Timers.Timer;
+using Caps=OpenSim.Region.Capabilities.Caps;
+using Image=System.Drawing.Image;
+using Timer=System.Timers.Timer;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -580,7 +581,7 @@ namespace OpenSim.Region.Environment.Scenes
                                      if (!avatar.IsChildAgent)
                                          avatar.ControllingClient.Kick("The simulator is going down.");
 
-                                     avatar.ControllingClient.OutPacket(PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator),
+                                     avatar.ControllingClient.OutPacket(PacketPool.Instance.GetPacket(PacketType.DisableSimulator),
                                                                         ThrottleOutPacketType.Task);
                                  });
 
@@ -755,17 +756,17 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 throw;
             }
-            catch (System.AccessViolationException e)
+            catch (AccessViolationException e)
             {
                 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
 
             }
-            catch (System.NullReferenceException e)
+            catch (NullReferenceException e)
             {
                 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
 
             }
-            catch (System.InvalidOperationException e)
+            catch (InvalidOperationException e)
             {
                 m_log.Error("[Scene]: Failed with exception " + e.ToString() + " On Region: " + RegionInfo.RegionName);
 
@@ -941,13 +942,13 @@ namespace OpenSim.Region.Environment.Scenes
                 if (map == null)
                 {
                     m_log.Info("[TERRAIN]: No default terrain. Generating a new terrain.");
-                    Heightmap = new Modules.Terrain.TerrainChannel();
+                    Heightmap = new TerrainChannel();
 
                     m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
                 }
                 else
                 {
-                    Heightmap = new Modules.Terrain.TerrainChannel(map);
+                    Heightmap = new TerrainChannel(map);
                 }
                
             }
@@ -1094,7 +1095,7 @@ namespace OpenSim.Region.Environment.Scenes
                 byte[] data;
                 try
                 {
-                    data = OpenJPEGNet.OpenJPEG.EncodeFromImage(mapbmp, false);
+                    data = OpenJPEG.EncodeFromImage(mapbmp, false);
                 }
                 catch (Exception)
                 {
@@ -1420,7 +1421,7 @@ namespace OpenSim.Region.Environment.Scenes
                     {
                         DeleteSceneObjectGroup(grp);
                     }
-                    catch (System.Exception)
+                    catch (Exception)
                     {
                         m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border.");
                     }
@@ -1714,7 +1715,7 @@ namespace OpenSim.Region.Environment.Scenes
                           {
                               client.SendKillObject(avatar.RegionHandle, avatar.LocalId);
                           }
-                          catch (System.NullReferenceException)
+                          catch (NullReferenceException)
                           {
                               //We can safely ignore null reference exceptions.  It means the avatar are dead and cleaned up anyway.
                           }
@@ -2041,7 +2042,7 @@ namespace OpenSim.Region.Environment.Scenes
                         m_innerScene.removeUserCount(true);
                     }
                     // Tell a single agent to disconnect from the region.
-                    libsecondlife.Packets.DisableSimulatorPacket disable = (libsecondlife.Packets.DisableSimulatorPacket)PacketPool.Instance.GetPacket(libsecondlife.Packets.PacketType.DisableSimulator);
+                    DisableSimulatorPacket disable = (DisableSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.DisableSimulator);
                     presence.ControllingClient.OutPacket(disable, ThrottleOutPacketType.Unknown);
                     presence.ControllingClient.Close(true);
                 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 5551173..d9dc1da 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -27,18 +27,18 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
-using OpenSim.Region.Terrain;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
     public abstract class SceneBase : IScene
     {
-        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);
 
         #region Events
 
@@ -204,7 +204,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// XXX These two methods are very temporary
         /// </summary>
-        protected Dictionary<LLUUID, String> capsPaths = new Dictionary<LLUUID, String>();
+        protected Dictionary<LLUUID, string> capsPaths = new Dictionary<LLUUID, string>();
         public string GetCapsPath(LLUUID agentId)
         {
             if (capsPaths.ContainsKey(agentId))
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index db2327e..0062e4d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -28,10 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -41,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes
 
     public class SceneCommunicationService //one instance per region
     {
-        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 CommunicationsManager m_commsProvider;
         protected RegionInfo m_regionInfo;
@@ -416,7 +417,7 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                 }
             }
-            catch (System.InvalidOperationException)
+            catch (InvalidOperationException)
             {
                 // We're ignoring a collection was modified error because this data gets old and outdated fast.
             }
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 5cf8ece..c9c0ad6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -25,11 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using libsecondlife;
 using System;
+using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using Caps = OpenSim.Region.Capabilities.Caps;
+using Caps=OpenSim.Region.Capabilities.Caps;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Environment.Scenes
         public delegate void DeregisterCapsEvent(LLUUID agentID, Caps caps);
         public event DeregisterCapsEvent OnDeregisterCaps;
 
-        public class MoneyTransferArgs : System.EventArgs 
+        public class MoneyTransferArgs : EventArgs 
         {
             public LLUUID sender;
             public LLUUID receiver;
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
-        public class LandBuyArgs : System.EventArgs
+        public class LandBuyArgs : EventArgs
         {
             public LLUUID agentId = LLUUID.Zero;
             
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 102be30..61a4eae 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -28,10 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
-using System.Net.Sockets;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
 
     public class SceneManager
     {
-        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 event RestartSim OnRestartSim;
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 495b604..d9808e6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -25,19 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-
+using System.Reflection;
 using libsecondlife;
-
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Scenes
 {
     public partial class SceneObjectGroup : EntityBase
     {
-        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);
 
         /// <summary>
         /// Start a given script.
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 7abaaee..8651d7e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -29,13 +29,11 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using System.Text;
 using System.Xml;
 using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Physics.Manager;
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 8ce71c4..72f78f3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -27,13 +27,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.Xml.Serialization;
-
+using System.Reflection;
 using libsecondlife;
-
+using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes.Scripting;
 
@@ -41,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
 {
     public partial class SceneObjectPart : IScriptHost
     {
-        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 string m_inventoryFileName = String.Empty;
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 61d10c9..40a9fcf 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -28,18 +28,16 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 using System.Xml;
 using System.Xml.Serialization;
 using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -324,7 +322,7 @@ namespace OpenSim.Region.Environment.Scenes
                 ParentGroup.ResetChildPrimPhysicsPositions();
                 
             }
-            catch (System.NullReferenceException)
+            catch (NullReferenceException)
             {
                 // Ignore, and skip over.
             }
@@ -2326,7 +2324,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             /*
@@ -2344,7 +2342,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             info.AddValue("m_inventoryFileName", m_inventoryFileName);
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8b8373d..d85eea6 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -27,16 +27,16 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Security.Permissions;
 using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Types;
 using OpenSim.Region.Physics.Manager;
-using OpenSim.Region.Environment.Interfaces;
-using System.Runtime.Serialization;
-using System.Security.Permissions;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Scenes
 //            System.Console.WriteLine("[ScenePresence] Destructor called");
 //        }
         
-        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 static AvatarAnimations Animations = new AvatarAnimations();
         public static byte[] DefaultTexture;
@@ -1746,7 +1746,7 @@ namespace OpenSim.Region.Environment.Scenes
                             movementvector.Z = force.Z;
                             Velocity = movementvector;
                         }
-                        catch (System.NullReferenceException)
+                        catch (NullReferenceException)
                         {
                             // Under extreme load, this returns a NullReference Exception that we can ignore. 
                             // Ignoring this causes no movement to be sent to the physics engine...  
@@ -1800,7 +1800,7 @@ namespace OpenSim.Region.Environment.Scenes
 
                 if (info == null)
                 {
-                    throw new System.ArgumentNullException("info");
+                    throw new ArgumentNullException("info");
                 }
 
                 FullID = new LLUUID((Guid)info.GetValue("FullID", typeof(Guid)));
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (info == null)
                 {
-                    throw new System.ArgumentNullException("info");
+                    throw new ArgumentNullException("info");
                 }
 
                 info.AddValue("FullID", FullID.UUID);
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 /* JB
             if (Animations == null)
@@ -2100,7 +2100,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             if (info == null)
             {
-                throw new System.ArgumentNullException("info");
+                throw new ArgumentNullException("info");
             }
 
             base.GetObjectData(info, context);
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
index 18b3f46..b1ee519 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
@@ -25,8 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework.Console;
-
 //TODO: WHERE TO PLACE THIS?
 
 namespace OpenSim.Region.Environment.Scenes.Scripting
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
index 7dee2e4..6216e2c 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineLoader.cs
@@ -29,13 +29,13 @@
 using System;
 using System.IO;
 using System.Reflection;
-using OpenSim.Framework.Console;
+using log4net;
 
 namespace OpenSim.Region.Environment.Scenes.Scripting
 {
     public class ScriptEngineLoader
     {
-        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 ScriptEngineInterface LoadScriptEngine(string EngineName)
         {