29 files changed, 124 insertions, 124 deletions

diff --git a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
index 7ae3eba..cec7192 100644
--- a/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
+++ b/OpenSim/Region/Environment/Modules/AgentAssetTransactionModule.cs
@@ -27,7 +27,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -129,8 +131,8 @@ namespace OpenSim.Region.Environment.Modules
     //should merge this classes and clean up
     public class AgentAssetTransactionsManager
     {
-        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);
 
         // Fields
         public Scene MyScene;
diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index d5f1b36..97db31e 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -25,9 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-using System.Threading;
 using libsecondlife;
 using libsecondlife.Packets;
 using Nini.Config;
diff --git a/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
index 52b9c3e..1b537c2 100644
--- a/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/AsteriskVoiceModule.cs
@@ -27,24 +27,25 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Capabilities;
-using Caps = OpenSim.Region.Capabilities.Caps;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
+using Caps=OpenSim.Region.Capabilities.Caps;
 
 namespace OpenSim.Region.Environment.Modules
 {
     public class AsteriskVoiceModule : IRegionModule
     {
-        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 Scene m_scene;
         private IConfig m_config;
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index e3ad297..44b3f8b 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -25,7 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -35,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules
 {
     public class AvatarProfilesModule : IRegionModule
     {
-        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 Scene m_scene;
 
         public AvatarProfilesModule()
@@ -92,8 +95,8 @@ namespace OpenSim.Region.Environment.Modules
             {
                 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
                     Util.ToDateTime(profile.Created).ToString(),
-                    System.String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
-                    profile.FirstLifeImage, profile.Image, System.String.Empty, partner);
+                    String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
+                    profile.FirstLifeImage, profile.Image, String.Empty, partner);
             }
             else
             {
diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
index 0748719..d5b2ea2 100644
--- a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
@@ -30,16 +30,15 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
+using System.Reflection;
 using System.Xml;
 using libsecondlife;
+using log4net;
 using Nini.Config;
+using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using Nwc.XmlRpc;
-
-using MoneyTransferArgs = OpenSim.Region.Environment.Scenes.EventManager.MoneyTransferArgs;
-using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs;
 
 namespace OpenSim.Region.Environment.Modules
 {   
@@ -56,7 +55,7 @@ namespace OpenSim.Region.Environment.Modules
     /// </summary>
     public class BetaGridLikeMoneyModule: IRegionModule
     {
-        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>
         /// Region UUIDS indexed by AgentID
@@ -341,7 +340,7 @@ namespace OpenSim.Region.Environment.Modules
             }
         }
 
-        private void ValidateLandBuy (Object osender, LandBuyArgs e)
+        private void ValidateLandBuy (Object osender, EventManager.LandBuyArgs e)
         {
                         if (m_MoneyAddress.Length == 0)
                         {
@@ -372,7 +371,7 @@ namespace OpenSim.Region.Environment.Modules
                         }
         }
 
-        private void processLandBuy(Object osender, LandBuyArgs e)
+        private void processLandBuy(Object osender, EventManager.LandBuyArgs e)
         {
                         lock(e)
                         {
@@ -396,7 +395,7 @@ namespace OpenSim.Region.Environment.Modules
         /// </summary>
         /// <param name="osender"></param>
         /// <param name="e"></param>
-        private void MoneyTransferAction (Object osender, MoneyTransferArgs e)
+        private void MoneyTransferAction (Object osender, EventManager.MoneyTransferArgs e)
         {
             IClientAPI sender = null;
             IClientAPI receiver = null;
@@ -724,7 +723,7 @@ namespace OpenSim.Region.Environment.Modules
                 {
                     returnfunds = GetFundsForAgentID(agentID);
                 }
-                catch (System.Exception e)
+                catch (Exception e)
                 {
                     client.SendAlertMessage(e.Message + " ");
                 }
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index f854409..30c1397 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -29,9 +29,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Sockets;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading;
 using libsecondlife;
+using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -41,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules
 {
     public class ChatModule : IRegionModule, ISimChat
     {
-        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 List<Scene> m_scenes = new List<Scene>();
 
@@ -116,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules
                     if (!m_irc_connector.IsAlive)
                     {
                         m_irc_connector.Start();
-                        OpenSim.Framework.ThreadTracker.Add(m_irc_connector);
+                        ThreadTracker.Add(m_irc_connector);
                     }
                 }
                 catch (Exception)
@@ -267,7 +269,7 @@ namespace OpenSim.Region.Environment.Modules
                     if (!m_irc_connector.IsAlive)
                     {
                         m_irc_connector.Start();
-                        OpenSim.Framework.ThreadTracker.Add(m_irc_connector);
+                        ThreadTracker.Add(m_irc_connector);
                     }
                 }
                 catch (Exception)
@@ -336,7 +338,7 @@ namespace OpenSim.Region.Environment.Modules
 
     internal class IRCChatModule
     {
-        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_server = null;
         private uint m_port = 6668;
@@ -431,13 +433,13 @@ namespace OpenSim.Region.Environment.Modules
                     pingSender.Name = "PingSenderThread";
                     pingSender.IsBackground = true;
                     pingSender.Start();
-                    OpenSim.Framework.ThreadTracker.Add(pingSender);
+                    ThreadTracker.Add(pingSender);
 
                     listener = new Thread(new ThreadStart(ListenerRun));
                     listener.Name = "IRCChatModuleListenerThread";
                     listener.IsBackground = true;
                     listener.Start();
-                    OpenSim.Framework.ThreadTracker.Add(listener);
+                    ThreadTracker.Add(listener);
 
                     m_writer.WriteLine(m_user);
                     m_writer.Flush();
diff --git a/OpenSim/Region/Environment/Modules/CommanderTestModule.cs b/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
index 0133f27..a30de73 100644
--- a/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
+++ b/OpenSim/Region/Environment/Modules/CommanderTestModule.cs
@@ -26,13 +26,10 @@
  */
 
 using System;
-using System.Collections.Generic;
-using libsecondlife;
 using Nini.Config;
-using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Environment.Modules.ModuleFramework;
+using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules
 {
diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
index ee84499..02354f1 100644
--- a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
@@ -26,14 +26,15 @@
  */
 
 using System;
-using System.Drawing;
 using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
 using libsecondlife;
 using Nini.Config;
+using OpenJPEGNet;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
-using OpenJPEGNet;
 
 namespace OpenSim.Region.Environment.Modules
 {
@@ -252,7 +253,7 @@ namespace OpenSim.Region.Environment.Modules
                 Bitmap joint;
                 Graphics jG;
 
-                joint = new Bitmap(back.Width, back.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+                joint = new Bitmap(back.Width, back.Height, PixelFormat.Format32bppArgb);
                 jG = Graphics.FromImage(joint);
 
                 jG.DrawImage(back, 0, 0, back.Width, back.Height);
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
index 0faa573..f811f22 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
@@ -27,18 +27,15 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using libsecondlife;
+using System.IO;
 using Nini.Config;
-using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Environment.Modules.ModuleFramework;
-using System.IO;
+using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.ExportSerialiser
 {
-    public class ExportSerialisationModule : IRegionModule, OpenSim.Region.Environment.Modules.ExportSerialiser.IRegionSerialiser
+    public class ExportSerialisationModule : IRegionModule, IRegionSerialiser
     {
         private List<Scene> m_regions = new List<Scene>();
         private List<IFileSerialiser> m_serialisers = new List<IFileSerialiser>();
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
index f13c8fa..8cd97a8 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/IFileSerialiser.cs
@@ -25,10 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.ExportSerialiser
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
index a9454fc..5b10957 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/IRegionSerialiser.cs
@@ -25,11 +25,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
+using System.Collections.Generic;
+using OpenSim.Region.Environment.Scenes;
+
 namespace OpenSim.Region.Environment.Modules.ExportSerialiser
 {
     public interface IRegionSerialiser
     {
-        System.Collections.Generic.List<string> SerialiseRegion(OpenSim.Region.Environment.Scenes.Scene scene, string saveDir);
+        List<string> SerialiseRegion(Scene scene, string saveDir);
     }
 }
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
index e413466..ac80f40 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
@@ -25,10 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Region.Environment.Scenes;
-using System.IO;
 using System.Collections.Generic;
+using System.IO;
+using System.Text;
 using System.Xml;
+using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.ExportSerialiser
 {
@@ -61,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
             xmlstream += "</scene>";
 
             MemoryStream stream = new MemoryStream();
-            XmlTextWriter formatter = new XmlTextWriter(stream, System.Text.Encoding.UTF8);
+            XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
             XmlDocument doc = new XmlDocument();
 
             doc.LoadXml(xmlstream);
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
index eeeacdc..8555089 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
@@ -26,6 +26,7 @@
  */
 
 using OpenSim.Region.Environment.Modules.Terrain;
+using OpenSim.Region.Environment.Modules.Terrain.FileLoaders;
 using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.ExportSerialiser
@@ -36,7 +37,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
 
         public string WriteToFile(Scene scene, string dir)
         {
-            ITerrainLoader fileSystemExporter = new Terrain.FileLoaders.RAW32();
+            ITerrainLoader fileSystemExporter = new RAW32();
             string targetFileName = dir + "heightmap.r32";
 
             lock (scene.Heightmap)
diff --git a/OpenSim/Region/Environment/Modules/FriendsModule.cs b/OpenSim/Region/Environment/Modules/FriendsModule.cs
index a2ec599..7e12618 100644
--- a/OpenSim/Region/Environment/Modules/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/FriendsModule.cs
@@ -26,8 +26,10 @@
  */
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
 using libsecondlife.Packets;
+using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
@@ -38,7 +40,7 @@ namespace OpenSim.Region.Environment.Modules
 {
     public class FriendsModule : IRegionModule
     {
-        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 List<Scene> m_scene = new List<Scene>();
 
diff --git a/OpenSim/Region/Environment/Modules/GroupsModule.cs b/OpenSim/Region/Environment/Modules/GroupsModule.cs
index 6cdae7b..b23bb91 100644
--- a/OpenSim/Region/Environment/Modules/GroupsModule.cs
+++ b/OpenSim/Region/Environment/Modules/GroupsModule.cs
@@ -27,7 +27,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
@@ -37,7 +39,7 @@ namespace OpenSim.Region.Environment.Modules
 {
     public class GroupsModule : IRegionModule
     {
-        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 List<Scene> m_scene = new List<Scene>();
         private Dictionary<LLUUID, IClientAPI> m_iclientmap = new Dictionary<LLUUID, IClientAPI>();
diff --git a/OpenSim/Region/Environment/Modules/InventoryModule.cs b/OpenSim/Region/Environment/Modules/InventoryModule.cs
index eadbb4f..ff5a02c 100644
--- a/OpenSim/Region/Environment/Modules/InventoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/InventoryModule.cs
@@ -25,12 +25,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Nini.Config;
-
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
@@ -39,8 +38,8 @@ namespace OpenSim.Region.Environment.Modules
 {
     public class InventoryModule : IRegionModule
     {
-        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 Scene m_scene;
         
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
index e3b7cf5..561c5cf 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandChannel.cs
@@ -27,18 +27,14 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using Axiom.Math;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Physics.Manager;
 
-using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs;
-
 namespace OpenSim.Region.Environment.Modules.LandManagement
 {
     public class LandChannel : ILandChannel
@@ -245,7 +241,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
                 x = Convert.ToInt32(Math.Floor(Convert.ToDouble(x_float) / Convert.ToDouble(4.0)));
                 y = Convert.ToInt32(Math.Floor(Convert.ToDouble(y_float) / Convert.ToDouble(4.0)));
             }
-            catch (System.OverflowException)
+            catch (OverflowException)
             {
                 return null;
             }
@@ -957,7 +953,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
                 // and land has been validated as well, this method transfers
                 // the land ownership
 
-        public void handleLandBuyRequest(Object o, LandBuyArgs e)
+        public void handleLandBuyRequest(Object o, EventManager.LandBuyArgs e)
                 {
             if (e.economyValidated && e.landValidated)
             {
@@ -976,7 +972,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
                 // be validated. This method validates the right to buy the
                 // parcel
 
-        public void handleLandValidationRequest(Object o, LandBuyArgs e)
+        public void handleLandValidationRequest(Object o, EventManager.LandBuyArgs e)
         {
             if (e.landValidated == false)
             {
@@ -994,7 +990,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
                     int saleprice = lob.landData.salePrice;
                     LLUUID pOwnerID = lob.landData.ownerID;
                     
-                    bool landforsale = ((lob.landData.landFlags & (uint)(libsecondlife.Parcel.ParcelFlags.ForSale | libsecondlife.Parcel.ParcelFlags.ForSaleObjects | libsecondlife.Parcel.ParcelFlags.SellParcelObjects)) != 0);
+                    bool landforsale = ((lob.landData.landFlags & (uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects)) != 0);
                     if ((AuthorizedID == LLUUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale)
                     {
                         lock (e)
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
index 20f75df..1c36c0c 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandManagementModule.cs
@@ -25,17 +25,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
-using System.Collections.Generic;
-using libsecondlife;
-using libsecondlife.Packets;
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment.Interfaces;
 using Nini.Config;
-
-using LandBuyArgs = OpenSim.Region.Environment.Scenes.EventManager.LandBuyArgs;
+using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.LandManagement
 {
diff --git a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
index 69d3c05..f9684e6 100644
--- a/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
+++ b/OpenSim/Region/Environment/Modules/LandManagement/LandObject.cs
@@ -27,12 +27,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
 using libsecondlife.Packets;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Region.Environment.Scenes;
 using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Scenes;
 
 namespace OpenSim.Region.Environment.Modules.LandManagement
 {
@@ -46,7 +47,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
     {
         #region Member Variables
 
-        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 LandData m_landData = new LandData();
         protected List<SceneObjectGroup> primsOverMe = new List<SceneObjectGroup>();
@@ -273,7 +274,7 @@ namespace OpenSim.Region.Environment.Modules.LandManagement
             newData.claimPrice = claimprice;
             newData.salePrice = 0;
             newData.authBuyerID = LLUUID.Zero;
-            newData.landFlags &= ~(uint)(libsecondlife.Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects);
+            newData.landFlags &= ~(uint)(Parcel.ParcelFlags.ForSale | Parcel.ParcelFlags.ForSaleObjects | Parcel.ParcelFlags.SellParcelObjects);
             m_scene.LandChannel.updateLandObject(landData.localID, newData);
 
             sendLandUpdateToAvatarsOverMe();
diff --git a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
index 9834a8a..27d73b5 100644
--- a/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
+++ b/OpenSim/Region/Environment/Modules/ModuleFramework/Commander.cs
@@ -27,8 +27,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text;
-
+using log4net;
+using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules.ModuleFramework
@@ -39,9 +41,9 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
     /// </summary>
     public class Command : ICommand
     {
-        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 Action<Object[]> m_command;
+        private Action<object[]> m_command;
         private string m_name;
         private string m_help;
         private List<CommandArgument> m_args = new List<CommandArgument>();
@@ -197,7 +199,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
     /// </summary>
     public class Commander : ICommander
     {
-        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 Dictionary<string, ICommand> m_commands = new Dictionary<string, ICommand>();
         private string m_name;
 
@@ -241,7 +243,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
                 classSrc += "\tpublic void " + EscapeRuntimeAPICommand(com.Name) + "( ";
                 foreach (KeyValuePair<string, string> arg in com.Arguments)
                 {
-                    classSrc += arg.Value + " " + Framework.Util.Md5Hash(arg.Key) + ",";
+                    classSrc += arg.Value + " " + Util.Md5Hash(arg.Key) + ",";
                 }
                 classSrc = classSrc.Remove(classSrc.Length - 1); // Delete the last comma
                 classSrc += " )\n\t{\n";
@@ -249,7 +251,7 @@ namespace OpenSim.Region.Environment.Modules.ModuleFramework
                 int i = 0;
                 foreach (KeyValuePair<string, string> arg in com.Arguments)
                 {
-                    classSrc += "\t\targs[" + i.ToString() + "] = " + Framework.Util.Md5Hash(arg.Key) + "  " + ";\n";
+                    classSrc += "\t\targs[" + i.ToString() + "] = " + Util.Md5Hash(arg.Key) + "  " + ";\n";
                     i++;
                 }                
                 classSrc += "\t\tGetCommander(\"" + m_name + "\").Run(\"" + com.Name + "\", args);\n";
diff --git a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
index 10e3840..2de5975 100644
--- a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
@@ -33,6 +33,7 @@ using System.Text;
 using System.Threading;
 using libsecondlife;
 using Nini.Config;
+using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
@@ -289,7 +290,7 @@ namespace OpenSim.Region.Environment.Modules
             httpThread.IsBackground = true;
             finished = false;
             httpThread.Start();
-            OpenSim.Framework.ThreadTracker.Add(httpThread);
+            ThreadTracker.Add(httpThread);
         }
 
         /*
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 1d32c1f..bde0dc0 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Modules
                 m_thread.Name = "ProcessTextureSenderThread";
                 m_thread.IsBackground = true;
                 m_thread.Start();
-                OpenSim.Framework.ThreadTracker.Add(m_thread);
+                ThreadTracker.Add(m_thread);
             }
 
             if (!m_scenes.Contains(scene))
diff --git a/OpenSim/Region/Environment/Modules/TextureSender.cs b/OpenSim/Region/Environment/Modules/TextureSender.cs
index 1500bdb..e54a1a2 100644
--- a/OpenSim/Region/Environment/Modules/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/TextureSender.cs
@@ -26,10 +26,10 @@
  */
 
 using System;
-using libsecondlife;
+using System.Reflection;
 using libsecondlife.Packets;
+using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 
 namespace OpenSim.Region.Environment.Modules
@@ -40,8 +40,8 @@ namespace OpenSim.Region.Environment.Modules
     /// </summary>
     public class TextureSender : ITextureSender
     {
-        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>
         /// Records the number of times texture send has been called.
diff --git a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
index ec977ba..2051a0f 100644
--- a/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
+++ b/OpenSim/Region/Environment/Modules/TreePopulatorModule.cs
@@ -27,10 +27,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using System.Timers;
+using Axiom.Math;
 using libsecondlife;
+using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
@@ -42,7 +45,7 @@ namespace OpenSim.Region.Environment.Modules
     public class TreePopulatorModule : IRegionModule
     {
         private Scene m_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);
 
         private List<LLUUID> m_trees;
 
@@ -63,8 +66,8 @@ namespace OpenSim.Region.Environment.Modules
 
             m_scene.EventManager.OnPluginConsole += new EventManager.OnPluginConsoleDelegate(EventManager_OnPluginConsole);
 
-            System.Timers.Timer CalculateTrees = new System.Timers.Timer(m_tree_updates);
-            CalculateTrees.Elapsed += new System.Timers.ElapsedEventHandler(CalculateTrees_Elapsed);
+            Timer CalculateTrees = new Timer(m_tree_updates);
+            CalculateTrees.Elapsed += new ElapsedEventHandler(CalculateTrees_Elapsed);
             CalculateTrees.Start();
             m_log.Debug("[TREES]: Initialised tree module");
         }
@@ -168,7 +171,7 @@ namespace OpenSim.Region.Environment.Modules
                     }
                     else
                     {
-                        selectedTree.SetText(killLikelyhood.ToString(), new Axiom.Math.Vector3(1.0f, 1.0f, 1.0f), 1.0);
+                        selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0);
                     }
                 }
                 else
@@ -217,7 +220,7 @@ namespace OpenSim.Region.Environment.Modules
             tree.SendGroupFullUpdate();
         }
 
-        void CalculateTrees_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        void CalculateTrees_Elapsed(object sender, ElapsedEventArgs e)
         {
             growTrees();
             seedTrees();
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 59ec981..b487628 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -25,15 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections.Generic;
-
+using System.Reflection;
 using libsecondlife;
-using libsecondlife.Packets;
-
+using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Limit;
-using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
@@ -46,8 +43,8 @@ namespace OpenSim.Region.Environment.Modules
     /// </summary>
     public class UserTextureDownloadService
     {
-        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>
         /// We will allow the client to request the same texture n times before dropping further requests
diff --git a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
index 9c91b25..0ea6fc3 100644
--- a/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
+++ b/OpenSim/Region/Environment/Modules/VectorRenderModule.cs
@@ -27,15 +27,17 @@
 
 using System;
 using System.Drawing;
+using System.Drawing.Imaging;
+using System.Globalization;
 using System.IO;
 using System.Net;
-using System.Globalization;
 using libsecondlife;
 using Nini.Config;
 using OpenJPEGNet;
-using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
+using Image=System.Drawing.Image;
+
 //using Cairo;
 
 namespace OpenSim.Region.Environment.Modules
@@ -96,9 +98,9 @@ namespace OpenSim.Region.Environment.Modules
             if ((size < 128) || (size > 1024))
                 size = 256;
             
-            Bitmap bitmap = new Bitmap(size, size, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+            Bitmap bitmap = new Bitmap(size, size, PixelFormat.Format32bppArgb);
 
-            System.Drawing.Graphics graph = System.Drawing.Graphics.FromImage(bitmap);
+            Graphics graph = Graphics.FromImage(bitmap);
 
             extraParams = extraParams.ToLower();
             int alpha = 255;
@@ -166,11 +168,11 @@ namespace OpenSim.Region.Environment.Modules
         }
 */
 
-        private void GDIDraw(string data, System.Drawing.Graphics graph)
+        private void GDIDraw(string data, Graphics graph)
         {
-            System.Drawing.Point startPoint = new System.Drawing.Point(0, 0);
-            System.Drawing.Point endPoint = new System.Drawing.Point(0, 0);
-            System.Drawing.Pen drawPen = new Pen(System.Drawing.Color.Black, 7);
+            Point startPoint = new Point(0, 0);
+            Point endPoint = new Point(0, 0);
+            Pen drawPen = new Pen(Color.Black, 7);
             Font myFont = new Font("Times New Roman", 14);
             SolidBrush myBrush = new SolidBrush(Color.Black);
             char[] lineDelimiter = { ';' };
@@ -213,7 +215,7 @@ namespace OpenSim.Region.Environment.Modules
                     GetParams(partsDelimiter, ref nextLine, 5, ref x, ref y);
                     endPoint.X = (int)x;
                     endPoint.Y = (int)y;
-                    System.Drawing.Image image = ImageHttpRequest(nextLine);
+                    Image image = ImageHttpRequest(nextLine);
                     graph.DrawImage(image, (float)startPoint.X, (float)startPoint.Y, x, y);
                     startPoint.X += endPoint.X;
                     startPoint.Y += endPoint.Y;
diff --git a/OpenSim/Region/Environment/Modules/VoiceModule.cs b/OpenSim/Region/Environment/Modules/VoiceModule.cs
index 8ca4698..106becd 100644
--- a/OpenSim/Region/Environment/Modules/VoiceModule.cs
+++ b/OpenSim/Region/Environment/Modules/VoiceModule.cs
@@ -27,23 +27,24 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Capabilities;
-using Caps = OpenSim.Region.Capabilities.Caps;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
+using Caps=OpenSim.Region.Capabilities.Caps;
 
 namespace OpenSim.Region.Environment.Modules
 {
     public class VoiceModule : IRegionModule
     {
-        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 Scene m_scene;
         private IConfig m_config;
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index 79e475c..5b18757 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -27,7 +27,6 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using libsecondlife;
 using Nini.Config;
 using OpenSim.Framework;
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 4f52ad6..e915fb8 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -28,11 +28,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
 using System.Threading;
 using libsecondlife;
+using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Console;
+using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
@@ -74,7 +77,7 @@ namespace OpenSim.Region.Environment.Modules
 {
     public class XMLRPCModule : IRegionModule, IXMLRPC
     {
-        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 object XMLRPCListLock = new object();
         private string m_name = "XMLRPCModule";
@@ -208,7 +211,7 @@ namespace OpenSim.Region.Environment.Modules
                         }
                     }
 
-                    System.Collections.IEnumerator tmpEnumerator = tmp.GetEnumerator();
+                    IEnumerator tmpEnumerator = tmp.GetEnumerator();
                     while ( tmpEnumerator.MoveNext() )
                         m_openChannels.Remove((LLUUID)tmpEnumerator.Current);
                 }
@@ -559,7 +562,7 @@ namespace OpenSim.Region.Environment.Modules
         private Thread httpThread;
         public LLUUID m_itemID;
         public uint m_localID;
-        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 SendRemoteDataRequest(uint localID, LLUUID itemID, string channel, string dest, int idata, string sdata)
         {
@@ -583,7 +586,7 @@ namespace OpenSim.Region.Environment.Modules
             httpThread.IsBackground = true;
             finished = false;
             httpThread.Start();
-            OpenSim.Framework.ThreadTracker.Add(httpThread);
+            ThreadTracker.Add(httpThread);
 
             return reqID;
 
@@ -648,7 +651,7 @@ namespace OpenSim.Region.Environment.Modules
                     }
                 }
             }
-            catch (System.Net.WebException we)
+            catch (WebException we)
             {
                 sdata = we.Message;
                 m_log.Warn("[SendRemoteDataRequest]: Request failed");