193 files changed, 1039 insertions, 1386 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0195bfa..b8fa786 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -27,14 +27,12 @@
 using System;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using log4net;
 using log4net.Config;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3492a19..228c0aa 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -26,18 +26,13 @@
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using System.Threading;
 using System.IO;
-using OpenSim.Framework;
-using Nini;
-using Nini.Config;
 using System.Reflection;
+using System.Threading;
+using System.Xml;
 using log4net;
+using Nini.Config;
+using OpenSim.Framework;
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 03e22ca..7d4a39c 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -26,31 +26,21 @@
 */
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
-using System.Net;
 using System.Reflection;
-using System.Xml;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Statistics;
-using OpenSim.Region.ClientStack;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.Local;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Hypergrid;
-using OpenSim.Region.CoreModules;
+using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Framework;
-using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
-using Timer = System.Timers.Timer;
 namespace OpenSim
 {
    public class HGOpenSimNode : OpenSim
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index fbe3813..fdc55c7 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -29,20 +29,16 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Reflection;
-using System.Runtime;
+using System.Timers;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Statistics;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
-using Timer = System.Timers.Timer;
 namespace OpenSim
 {
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 43cb127..f4e28be 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -28,11 +28,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Reflection;
 using System.Text;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
@@ -44,7 +41,6 @@ using OpenSim.Framework.Statistics;
 using OpenSim.Region.ClientStack;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
-using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -446,7 +442,7 @@ namespace OpenSim
                // Carrying on now causes a lot of confusion down the
                // line - we need to get the user's attention
-                System.Environment.Exit(1);
+                Environment.Exit(1);
            }
            // We need to do this after we've initialized the
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index f947d06..a7b65cb 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -31,9 +31,6 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Region.ClientStack;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.ClientStack
 {
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index 8bd5434..b0749c6 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -30,7 +30,6 @@ using System.Net.Sockets;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.ClientStack
 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
index 8197ec7..df6534f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/KillPacket.cs
@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using OpenMetaverse.Packets;
 namespace OpenSim.Region.ClientStack.LindenUDP
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index a785e64..3b8b48f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -33,17 +33,16 @@ using System.Text;
 using System.Threading;
 using System.Timers;
 using System.Xml;
+using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
-using OpenMetaverse.StructuredData;
-using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Statistics;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using Timer = System.Timers.Timer;
+using Timer=System.Timers.Timer;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
@@ -474,7 +473,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            m_PacketHandler.OnPacketStats += PopulateStats;
            RegisterLocalPacketHandlers();
-            m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<OpenSim.Region.Framework.Interfaces.IJ2KDecoder>());
+            m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface<IJ2KDecoder>());
        }
        public void SetDebugPacketLevel(int newDebugPacketLevel)
@@ -1230,7 +1229,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            fromAgent, toAgent, false, false, false);
                    }
-                    System.Console.WriteLine("SendInstantMessage: " + msg);
+                    Console.WriteLine("SendInstantMessage: " + msg);
                }
                else
                    OutPacket(msg, ThrottleOutPacketType.Task);
@@ -6857,15 +6856,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                                              groupTitlesRequest.AgentData.GroupID);
                        groupTitlesReply.GroupData =
-                            new GroupTitlesReplyPacket.
+                            new GroupTitlesReplyPacket.GroupDataBlock[titles.Count];
-                                GroupDataBlock[titles.Count];
                        int i = 0;
                        foreach (GroupTitlesData d in titles)
                        {
                            groupTitlesReply.GroupData[i] =
-                                new GroupTitlesReplyPacket.
+                                new GroupTitlesReplyPacket.GroupDataBlock();
-                                    GroupDataBlock();
                            groupTitlesReply.GroupData[i].Title =
                                Utils.StringToBytes(d.Name);
@@ -6980,8 +6977,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        groupRolesReply.AgentData.AgentID = AgentId;
                        groupRolesReply.GroupData =
-                            new GroupRoleDataReplyPacket.
+                            new GroupRoleDataReplyPacket.GroupDataBlock();
-                                GroupDataBlock();
                        groupRolesReply.GroupData.GroupID =
                            groupRolesRequest.GroupData.GroupID;
@@ -6997,15 +6993,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            titles.Count;
                        groupRolesReply.RoleData =
-                            new GroupRoleDataReplyPacket.
+                            new GroupRoleDataReplyPacket.RoleDataBlock[titles.Count];
-                                RoleDataBlock[titles.Count];
                        int i = 0;
                        foreach (GroupRolesData d in titles)
                        {
                            groupRolesReply.RoleData[i] =
-                                new GroupRoleDataReplyPacket.
+                                new GroupRoleDataReplyPacket.RoleDataBlock();
-                                    RoleDataBlock();
                            groupRolesReply.RoleData[i].RoleID =
                                d.RoleID;
@@ -7051,15 +7045,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            (uint)mappings.Count;
                        groupRoleMembersReply.MemberData =
-                            new GroupRoleMembersReplyPacket.
+                            new GroupRoleMembersReplyPacket.MemberDataBlock[mappings.Count];
-                                MemberDataBlock[mappings.Count];
                        int i = 0;
                        foreach (GroupRoleMembersData d in mappings)
                        {
                            groupRoleMembersReply.MemberData[i] =
-                                new GroupRoleMembersReplyPacket.
+                                new GroupRoleMembersReplyPacket.MemberDataBlock();
-                                    MemberDataBlock();
                            groupRoleMembersReply.MemberData[i].RoleID =
                                d.RoleID;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
index b801f7a..f79f62e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -27,16 +27,8 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Xml;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Statistics;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 43a2e23..6f9e5d3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -27,13 +27,11 @@
 using System;
 using System.Collections.Generic;
+using C5;
 using OpenMetaverse;
+using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
-using C5;
-using OpenSim.Framework.Communications.Cache;
-using OpenMetaverse.Imaging;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 97d75e1..23118a2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -26,19 +26,14 @@
 */
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using System.Timers;
-using System.Reflection;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
-using Timer = System.Timers.Timer;
 using OpenSim.Framework;
-using OpenSim.Region.ClientStack.LindenUDP;
+using Timer=System.Timers.Timer;
-using log4net;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
@@ -96,7 +91,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private Dictionary<uint, int> m_DupeTracker =
            new Dictionary<uint, int>();
        private uint m_DupeTrackerWindow = 30;
-        private int m_DupeTrackerLastCheck = System.Environment.TickCount;
+        private int m_DupeTrackerLastCheck = Environment.TickCount;
        // Values for the SimStatsReporter
        //
@@ -164,7 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        {
            m_Client = client;
            m_PacketServer = server;
-            m_DropSafeTimeout = System.Environment.TickCount + 15000;
+            m_DropSafeTimeout = Environment.TickCount + 15000;
            m_PacketQueue = new LLPacketQueue(client.AgentId, userSettings);
@@ -225,9 +220,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            // acks being appended to the payload, just don't send
            // any with them until libsl is fixed.
            //
-            if (packet is OpenMetaverse.Packets.ViewerEffectPacket)
+            if (packet is ViewerEffectPacket)
                return;
-            if (packet is OpenMetaverse.Packets.SimStatsPacket)
+            if (packet is SimStatsPacket)
                return;
            // Add acks to outgoing packets
@@ -261,7 +256,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
            item.Packet = packet;
            item.Incoming = false;
            item.throttleType = throttlePacketType;
-            item.TickCount = System.Environment.TickCount;
+            item.TickCount = Environment.TickCount;
            item.Identifier = id;
            item.Resends = 0;
            item.Length = packet.ToBytes().Length;
@@ -272,7 +267,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
        private void ResendUnacked()
        {
-            int now = System.Environment.TickCount;
+            int now = Environment.TickCount;
            int intervalMs = 250;
@@ -341,7 +336,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                            }
                            m_NeedAck[packet.Header.Sequence].TickCount =
-                                    System.Environment.TickCount;
+                                    Environment.TickCount;
                            QueuePacket(packet, ThrottleOutPacketType.Resend,
                                    data.Identifier);
@@ -463,10 +458,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                if (m_DupeTracker.Count < 1024)
                    return;
-                if (System.Environment.TickCount - m_DupeTrackerLastCheck < 2000)
+                if (Environment.TickCount - m_DupeTrackerLastCheck < 2000)
                    return;
-                m_DupeTrackerLastCheck = System.Environment.TickCount;
+                m_DupeTrackerLastCheck = Environment.TickCount;
                Dictionary<uint, int> packs =
                    new Dictionary<uint, int>(m_DupeTracker);
@@ -673,7 +668,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                item.Packet = packet;
                item.Incoming = false;
                item.throttleType = 0;
-                item.TickCount = System.Environment.TickCount;
+                item.TickCount = Environment.TickCount;
                item.Identifier = 0;
                item.Resends = 0;
                item.Length = packet.ToBytes().Length;
@@ -741,7 +736,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                        m_UnackedBytes += item.Length;
                        // Keep track of when this packet was sent out
-                        item.TickCount = System.Environment.TickCount;
+                        item.TickCount = Environment.TickCount;
                        m_NeedAck[packet.Header.Sequence] = item;
                    }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 17c3f97..1c398d9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -27,23 +27,22 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
 using System.Timers;
+using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Statistics;
 using OpenSim.Framework.Statistics.Interfaces;
-using OpenSim.Region.ClientStack;
 using Timer=System.Timers.Timer;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
    public class LLPacketQueue : IPullStatsProvider
    {
-        private static readonly log4net.ILog m_log
+        private static readonly ILog m_log
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        /// <summary>
        /// Is queueing enabled at all?
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index a42ae04..7305f34 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -27,12 +27,9 @@
 using System.Net;
 using System.Net.Sockets;
-using System.Reflection;
-using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index eb88715..7aea9a3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -31,11 +31,10 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
-using OpenMetaverse.Packets;
 using log4net;
 using Nini.Config;
+using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.ClientStack.LindenUDP
@@ -304,7 +303,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                // the next set of UDP data is for a valid client.         
                ResetServerEndPoint(e);
            }
-            catch (System.ObjectDisposedException)
+            catch (ObjectDisposedException)
            {
                m_log.Info("[UDPSERVER]: UDP Object disposed.   No need to worry about this if you're restarting the simulator.");
            }            
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
index d704967..ca26f5b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
@@ -26,7 +26,6 @@
 */
 using OpenMetaverse;
-using System;
 namespace OpenSim.Region.ClientStack.LindenUDP
 {        
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index b2cf14c..1f564b7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -26,17 +26,13 @@
 */
 using System.Net;
-using System.Threading;
+using log4net.Config;
-using log4net;
 using Nini.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Region.ClientStack;
-using OpenSim.Region.ClientStack.LindenUDP;
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
@@ -51,7 +47,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
        {
            try
            {
-                log4net.Config.XmlConfigurator.Configure();
+                XmlConfigurator.Configure();
            }
            catch
            {
@@ -118,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            UseCircuitCodePacket uccp = new UseCircuitCodePacket();
            
            UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock 
-                = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock();
+                = new UseCircuitCodePacket.CircuitCodeBlock();
            uccpCcBlock.Code = circuitCode;
            uccpCcBlock.ID = agentId;
            uccpCcBlock.SessionID = sessionId;
@@ -169,7 +165,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
            UseCircuitCodePacket uccp = new UseCircuitCodePacket();
            
            UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock 
-                = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock();
+                = new UseCircuitCodePacket.CircuitCodeBlock();
            uccpCcBlock.Code = myCircuitCode;
            uccpCcBlock.ID = myAgentUuid;
            uccpCcBlock.SessionID = mySessionUuid;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
index 90d7d63..d4e906a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs
@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Xml;
-using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
index d421f82..6e429a4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs
@@ -25,14 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Threading;
 using Nini.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Region.ClientStack.LindenUDP;
 using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
index 507fe82..667014e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs
@@ -26,9 +26,7 @@
 */
 using System.Collections.Generic;
-using OpenMetaverse;
 using OpenMetaverse.Packets;
-using OpenSim.Region.ClientStack.LindenUDP;
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 { 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 91fadba..53506d3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -30,8 +30,6 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using OpenMetaverse.Packets;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 24ebd7e..55cf1ae 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -26,19 +26,16 @@
 */
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules;
 using OpenSim.Region.Physics.Manager;
 namespace OpenSim.Region.ClientStack
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 4de4b2b..c8a540b 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -25,14 +25,12 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-using System.Reflection;
+using System.Reflection;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.OGS1;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index 39e13d1..5feea4d 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -30,8 +30,8 @@
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.Local;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.Communications.Local;
 namespace OpenSim.Region.Communications.Hypergrid
 {
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index d93918d..72c0f42 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -31,30 +31,22 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Runtime.Remoting;
-using System.Runtime.Remoting.Channels;
-using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
-using System.Threading;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
+using OpenMetaverse.Imaging;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
-// using OpenSim.Region.Environment.Modules.Framework;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
+// using OpenSim.Region.Environment.Modules.Framework;
 namespace OpenSim.Region.Communications.Hypergrid
 {
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index d1f416d..94646d2 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -29,18 +29,14 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
 namespace OpenSim.Region.Communications.Hypergrid
 {
    public class HGGridServicesGridMode : HGGridServices
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
index 0f6b4c7..ea8ac2e 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesStandalone.cs
@@ -25,6 +25,7 @@
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -35,19 +36,15 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
+using log4net;
+using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Communications.Local;
 using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using Nwc.XmlRpc;
-using log4net;
 namespace OpenSim.Region.Communications.Hypergrid
 {
    public class HGGridServicesStandalone : HGGridServices
diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
index 874e8fb..8296910 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 084a9e9..e9eb18c 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -25,15 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Net;
-using System.Reflection;
-using System.Text.RegularExpressions;
 using OpenMetaverse;
-using log4net;
-using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Communications.OGS1;
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 6a3b80d..5df3c34 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 5cb33cc..d4560be 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -27,8 +27,8 @@
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 5cd587d..3ad7249 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -30,8 +30,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index ca48814..d5305cc 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -28,7 +28,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
@@ -36,11 +35,9 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
-using System.Threading;
-using OpenMetaverse;
 using log4net;
-using Nini.Config;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 0195a58..dd4d0aa 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -28,8 +28,8 @@
 using System;
 using System.Reflection;
 using System.Runtime.Remoting;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 namespace OpenSim.Region.Communications.OGS1
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index b9e8394..49d5938 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
index c690def..0f4c732 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -29,8 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 94a7a5c..b4b73b0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -31,9 +31,9 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using OpenMetaverse;
 using log4net;
 using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
index 2be1eaa..3c24b05 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
@@ -25,13 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Collections.Generic;
 //using System.Reflection;
 //using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index b4dbaa1..0bf91e0 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -25,12 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
 using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
@@ -39,7 +40,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
    /// </summary>
    public class AgentAssetTransactions
    {
-        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
        private bool m_dumpAssetsToFile;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 77dfd44..3fd4a70 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -27,8 +27,8 @@
 using System;
 using System.Collections.Generic;
-using OpenMetaverse;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index aef2664..9af764f 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -30,10 +30,8 @@ using System.IO;
 using System.Reflection;
 using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 4f7f177..6327466 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -32,11 +32,9 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.CoreModules.Agent.Capabilities
 {
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
index 107855d..4bfa18f 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -27,27 +27,29 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
-using OpenMetaverse;
+using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
 using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
 namespace OpenSim.Region.CoreModules.Agent.TextureDownload
 {
    public class TextureDownloadModule : IRegionModule
    {
-        private static readonly log4net.ILog m_log
+        private static readonly ILog m_log
-            = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        /// <summary>
        /// There is one queue for all textures waiting to be sent, regardless of the requesting user.
        /// </summary>
-        private readonly OpenSim.Framework.BlockingQueue<ITextureSender> m_queueSenders
+        private readonly BlockingQueue m_queueSenders
-            = new OpenSim.Framework.BlockingQueue<ITextureSender>();
+            = new BlockingQueue();
        /// <summary>
        /// Each user has their own texture download service.
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
index 7309282..acc8c98 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -25,10 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Reflection;
-using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 675bb0f..2f98bab 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -27,8 +27,8 @@
 using System.Collections.Generic;
 using System.Reflection;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Limit;
 using OpenSim.Framework.Statistics;
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index df672b8..3a1d9a3 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -26,11 +26,10 @@
 */
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
-using System.Threading;
-using System.Collections.Generic;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
@@ -166,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
        private void doJ2kDecode(UUID AssetId, byte[] j2kdata)
        {
            int DecodeTime = 0;
-            DecodeTime = System.Environment.TickCount;
+            DecodeTime = Environment.TickCount;
            OpenJPEG.J2KLayerInfo[] layers = new OpenJPEG.J2KLayerInfo[0]; // Dummy result for if it fails.  Informs that there's only full quality
            if (!OpenJpegFail)
@@ -198,7 +197,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                               
                                    // Write out decode time
-                                    m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", System.Environment.TickCount - DecodeTime,
+                                    m_log.InfoFormat("[J2KDecoderModule]: {0} Decode Time: {1}", Environment.TickCount - DecodeTime,
                                                     AssetId);
                               
                            }
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
index df553ac..ec95187 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -26,12 +26,10 @@
 */
 using System;
-using System.Collections;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.CoreModules.Agent.TextureSender;
 using OpenSim.Tests.Common.Mock;
 namespace OpenSim.Region.CoreModules.Agent.TextureSender
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
index b3ac624..dde8566 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
@@ -27,7 +27,6 @@
 using System;
 using System.Reflection;
-using OpenMetaverse.Packets;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index cb81c0d..1a2207f 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -27,8 +27,8 @@
 using System;
 using System.Collections.Generic;
-using OpenMetaverse;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index d084dbd..38b9dca 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -25,19 +25,16 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Reflection;
-using System.Reflection;
+using log4net;
+using Nini.Config;
-using System.Threading;
+using OpenMetaverse;
-using OpenMetaverse;
+using OpenSim.Framework;
-using log4net;
+using OpenSim.Framework.Communications.Cache;
-using Nini.Config;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
    public class AvatarFactoryModule : IAvatarFactory, IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index f036faf..323cb69 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -25,20 +25,16 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.Reflection;
-using System.Net.Sockets;
+using log4net;
-using System.Reflection;
+using Nini.Config;
-using System.Text.RegularExpressions;
+using OpenMetaverse;
-using System.Threading;
+using OpenSim.Framework;
-using OpenMetaverse;
+using OpenSim.Region.Framework.Interfaces;
-using log4net;
+using OpenSim.Region.Framework.Scenes;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Chat
 {
    public class ChatModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 1ed608a..f4dffb5 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -25,22 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using Nini.Config;
-using System.Net;
+using OpenSim.Region.Framework.Interfaces;
-using System.Net.Sockets;
+using OpenSim.Region.Framework.Scenes;
-using System.Reflection;
-using System.Xml;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
 {
    public class CombatModule : IRegionModule
@@ -117,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
                            foundResult = true;
                        }
                    }
-                } catch (System.InvalidOperationException)
+                } catch (InvalidOperationException)
                {
                }
diff --git a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 0a1de44..4ea9958 100644
--- a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -25,23 +25,23 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Net;
+using System.Net;
-using System.Net.Sockets;
+using System.Net.Sockets;
-using System.Reflection;
+using System.Reflection;
-using System.Xml;
+using System.Xml;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using Nwc.XmlRpc;
+using Nwc.XmlRpc;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 7326373..6dbc774 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -25,15 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using Nini.Config;
-using log4net;
+using OpenMetaverse;
-using Nini.Config;
+using OpenSim.Framework;
-using OpenMetaverse;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Dialog
 {
    public class DialogModule : IRegionModule, IDialogModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index fb4d08a..98683b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -25,20 +25,19 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using Nini.Config;
-using Nini.Config;
+using Nwc.XmlRpc;
-using Nwc.XmlRpc;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Friends
 {
    /*
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index a3a642f..d2bd803 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -25,16 +25,15 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using log4net;
+using System.Reflection;
-using Nini.Config;
+using log4net;
-using OpenMetaverse;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenMetaverse;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
-using System.Reflection;
 namespace OpenSim.Region.CoreModules.Avatar.Gestures
 {
    public class GesturesModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index 92d0fdd..4786cab 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -25,16 +25,15 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Reflection;
-using System.Reflection;
+using log4net;
-using OpenMetaverse;
+using Nini.Config;
-using log4net;
+using OpenMetaverse;
-using Nini.Config;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Groups
 {
    public class GroupsModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 3ad2c91..7556388 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -24,21 +24,16 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System.Collections.Generic;
-using System.Collections;
+using System.Reflection;
-using System.Collections.Generic;
+using log4net;
-using System.Reflection;
+using Nini.Config;
-using System.Net;
+using OpenMetaverse;
-using System.Threading;
+using OpenSim.Framework;
-using OpenMetaverse;
+using OpenSim.Framework.Client;
-using log4net;
+using OpenSim.Region.Framework.Interfaces;
-using Nini.Config;
+using OpenSim.Region.Framework.Scenes;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
    public class InstantMessageModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 91c22eb..beff362 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -24,21 +24,19 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Net;
-using System.Net;
+using System.Reflection;
-using System.Threading;
+using log4net;
-using OpenMetaverse;
+using Nini.Config;
-using log4net;
+using Nwc.XmlRpc;
-using Nini.Config;
+using OpenMetaverse;
-using Nwc.XmlRpc;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework.Client;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
    public class MessageTransferModule : IRegionModule, IMessageTransferModule
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index 49fd70a..3f41457 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -24,21 +24,18 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System.Collections;
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Net;
-using System.Reflection;
+using System.Reflection;
-using System.Net;
+using log4net;
-using System.Threading;
+using Nini.Config;
-using OpenMetaverse;
+using Nwc.XmlRpc;
-using log4net;
+using OpenMetaverse;
-using Nini.Config;
+using OpenSim.Framework;
-using Nwc.XmlRpc;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
    public class PresenceModule : IRegionModule, IPresenceModule
@@ -344,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
                }
            }
-            catch (System.Net.WebException)
+            catch (WebException)
            {
                m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
            }
@@ -367,7 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
                }
            }
-            catch (System.Net.WebException)
+            catch (WebException)
            {
                m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
            }
@@ -392,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
                }
            }
-            catch (System.Net.WebException)
+            catch (WebException)
            {
                m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
            }
@@ -417,7 +414,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
                }
            }
-            catch (System.Net.WebException)
+            catch (WebException)
            {
                m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
            }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index c5cffa3..5ae5b4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -25,22 +25,20 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
-using System.Reflection;
+using System.Reflection;
-using System.Xml;
+using System.Text;
-using OpenMetaverse;
+using System.Xml;
-using OpenSim.Region.Framework.Scenes;
+using log4net;
-using OpenSim.Region.CoreModules.World.Archiver;
+using OpenMetaverse;
-using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.CoreModules.World.Archiver;
-using log4net;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {
    public class InventoryArchiveReadRequest
@@ -48,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        protected TarArchiveReader archive;
-        private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+        private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
        private string m_firstName;
        private string m_lastName;
@@ -98,13 +96,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            item.ID = UUID.Parse(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("InvType");
-            item.InvType = System.Convert.ToInt32(reader.ReadString());
+            item.InvType = Convert.ToInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("CreatorUUID");
            item.Creator = UUID.Parse(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("CreationDate");
-            item.CreationDate = System.Convert.ToInt32(reader.ReadString());
+            item.CreationDate = Convert.ToInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("Owner");
            item.Owner = UUID.Parse(reader.ReadString());
@@ -121,37 +119,37 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                reader.ReadEndElement();
            }
            reader.ReadStartElement("AssetType");
-            item.AssetType = System.Convert.ToInt32(reader.ReadString());
+            item.AssetType = Convert.ToInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("AssetID");
            item.AssetID = UUID.Parse(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("SaleType");
-            item.SaleType = System.Convert.ToByte(reader.ReadString());
+            item.SaleType = Convert.ToByte(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("SalePrice");
-            item.SalePrice = System.Convert.ToInt32(reader.ReadString());
+            item.SalePrice = Convert.ToInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("BasePermissions");
-            item.BasePermissions = System.Convert.ToUInt32(reader.ReadString());
+            item.BasePermissions = Convert.ToUInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("CurrentPermissions");
-            item.CurrentPermissions = System.Convert.ToUInt32(reader.ReadString());
+            item.CurrentPermissions = Convert.ToUInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("EveryOnePermssions");
-            item.EveryOnePermissions = System.Convert.ToUInt32(reader.ReadString());
+            item.EveryOnePermissions = Convert.ToUInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("NextPermissions");
-            item.NextPermissions = System.Convert.ToUInt32(reader.ReadString());
+            item.NextPermissions = Convert.ToUInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("Flags");
-            item.Flags = System.Convert.ToUInt32(reader.ReadString());
+            item.Flags = Convert.ToUInt32(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("GroupID");
            item.GroupID = UUID.Parse(reader.ReadString());
            reader.ReadEndElement();
            reader.ReadStartElement("GroupOwned");
-            item.GroupOwned = System.Convert.ToBoolean(reader.ReadString());
+            item.GroupOwned = Convert.ToBoolean(reader.ReadString());
            reader.ReadEndElement();
            //reader.ReadStartElement("ParentFolderID");
            //item.Folder = UUID.Parse(reader.ReadString());
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index bfa4de9..da4785b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -25,20 +25,19 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
-using System.Reflection;
+using System.Reflection;
-using System.Xml;
+using System.Xml;
-using OpenMetaverse;
+using log4net;
-using OpenSim.Region.Framework.Scenes;
+using OpenMetaverse;
-using OpenSim.Region.CoreModules.World.Archiver;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.CoreModules.World.Archiver;
-using log4net;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {        
    public class InventoryArchiveWriteRequest
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index a684b69..b025a31 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -25,17 +25,17 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {      
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d2cf6c9..98d952c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -25,18 +25,17 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Reflection;
-using System.Reflection;
+using log4net;
-using OpenMetaverse;
+using Nini.Config;
-using log4net;
+using OpenMetaverse;
-using Nini.Config;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 {
    public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index ebf4f0a..c0e4b48 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -25,21 +25,16 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Reflection;
-using System.Reflection;
+using log4net;
-using System.Net;
+using Nini.Config;
-using System.Threading;
+using OpenMetaverse;
-using OpenMetaverse;
+using OpenSim.Framework;
-using log4net;
+using OpenSim.Region.Framework.Interfaces;
-using Nini.Config;
+using OpenSim.Region.Framework.Scenes;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Client;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Lure
 {
    public class LureModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index 193307d..ab65f8e 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,19 +25,19 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Reflection;
+using System.Reflection;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenMetaverse.StructuredData;
+using OpenMetaverse.StructuredData;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
 {
    public class ObjectAdd : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index 6ea5b56..74e5b4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -25,16 +25,16 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Globalization;
+using System.Globalization;
-using System.Reflection;
+using System.Reflection;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Profiles
 {
    public class AvatarProfilesModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index 98536ed..ac40a17 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -24,20 +24,12 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
 using System.Reflection;
-using System.Threading;
-using System.Xml;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
-using Nwc.XmlRpc;
+using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
index 8a4bb09..3574b39 100644
--- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs
@@ -24,29 +24,23 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.IO;
-using System.IO;
+using System.Net;
-using System.Net;
+using System.Reflection;
-using System.Net.Sockets;
+using System.Text;
-using System.Reflection;
+using log4net;
-using System.Threading;
+using Nini.Config;
-using System.Xml;
+using OpenMetaverse;
-using OpenMetaverse;
+using OpenMetaverse.StructuredData;
-using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
-using log4net;
+using OpenSim.Framework.Communications;
-using Nini.Config;
+using OpenSim.Region.CoreModules.Communications.Local;
-using Nwc.XmlRpc;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes.Hypergrid;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Hypergrid;
-using OpenSim.Region.CoreModules.Communications.Local;
 namespace OpenSim.Region.CoreModules.Communications.REST
 {
    public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
@@ -278,7 +272,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
            try
            {
                strBuffer = OSDParser.SerializeJsonString(args);
-                System.Text.UTF8Encoding str = new System.Text.UTF8Encoding();
+                UTF8Encoding str = new UTF8Encoding();
                buffer = str.GetBytes(strBuffer);
            }
@@ -363,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
            try
            {
                strBuffer = OSDParser.SerializeJsonString(args);
-                System.Text.UTF8Encoding str = new System.Text.UTF8Encoding();
+                UTF8Encoding str = new UTF8Encoding();
                buffer = str.GetBytes(strBuffer);
            }
@@ -509,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST
            try
            {
                strBuffer = OSDParser.SerializeJsonString(args);
-                System.Text.UTF8Encoding str = new System.Text.UTF8Encoding();
+                UTF8Encoding str = new UTF8Encoding();
                buffer = str.GetBytes(strBuffer);
            }
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index e81466a..3999213 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -25,32 +25,23 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Net;
+using System.Net;
-using System.Net.Sockets;
+using System.Reflection;
-using System.Reflection;
+using System.Threading;
-using System.Threading;
+using log4net;
-using System.Xml;
+using Nini.Config;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenMetaverse.Packets;
+using OpenMetaverse.Packets;
-using OpenMetaverse.StructuredData;
+using OpenMetaverse.StructuredData;
-using log4net;
+using OpenSim.Framework;
-using Nini.Config;
+using OpenSim.Framework.Servers;
-using Nwc.XmlRpc;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
+using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
-using OpenSim.Framework.Communications.Capabilities;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
 namespace OpenSim.Region.CoreModules.Framework.EventQueue
 {
@@ -326,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
            m_scene.CommsManager.HttpServer.AddHTTPHandler(
                capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
-            Random rnd = new Random(System.Environment.TickCount);
+            Random rnd = new Random(Environment.TickCount);
            lock (m_ids)
            {
                if (!m_ids.ContainsKey(agentID))
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
index 80f6fce..5590516 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -25,12 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Net;
+using System.Net;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenMetaverse.Packets;
+using OpenMetaverse.Packets;
-using OpenMetaverse.StructuredData;
+using OpenMetaverse.StructuredData;
 namespace OpenSim.Region.CoreModules.Framework.EventQueue
 {
    public class EventQueueHelper
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
index fe29e0c..11d13b9 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
index cd905ab..d98a0f8 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
@@ -25,14 +25,14 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using System.Text;
+using System.Text;
-using log4net;
+using log4net;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index 13efe6b..095c837 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -26,25 +26,19 @@
 *
 */
-using System;
+using System.Reflection;
-using System.Collections.Generic;
+using log4net;
-using System.Net;
+using Nini.Config;
-using System.Reflection;
+using OpenMetaverse;
+using OpenSim.Data;
-using log4net;
+using OpenSim.Framework;
-using Nini.Config;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
-using OpenMetaverse;
+using OpenSim.Framework.Servers;
+using OpenSim.Grid.AssetServer;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Grid.AssetServer;
-using OpenSim.Data;
 namespace OpenSim.Region.CoreModules.Hypergrid
 {
    public class HGStandaloneAssetService : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
index dfc859e..bf88878 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
@@ -26,20 +26,18 @@
 * 
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Net;
+using System.Reflection;
-using System.Reflection;
+using log4net;
-using log4net;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using OpenMetaverse;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Hypergrid
 {
    public class HGStandaloneInventoryService : IRegionModule
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 5540cc3..6c06fb1 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -27,36 +27,16 @@
 */
-using System;
+using System.Collections.Generic;
-using System.Collections;
+using System.Reflection;
-using System.Collections.Generic;
+using log4net;
-using System.Drawing;
+using Nini.Config;
-using System.Drawing.Imaging;
+using OpenMetaverse;
-using System.IO;
+using OpenSim.Framework;
-using System.Net;
+using OpenSim.Region.CoreModules.World.WorldMap;
-using System.Reflection;
+using OpenSim.Region.Framework.Interfaces;
-using System.Threading;
+using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using OpenMetaverse.StructuredData;
-using log4net;
-using Nini.Config;
-using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Types;
-using OpenSim.Region.CoreModules.World.WorldMap;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 namespace OpenSim.Region.CoreModules.Hypergrid
 {
    public class HGWorldMapModule : WorldMapModule, IRegionModule
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 2e1675b..42a76bd 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -25,32 +25,27 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Net;
+using System.Net;
-using System.Net.Security;
+using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
+using System.Reflection;
-using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
-using System.Threading;
+using System.Threading;
-using System.Web;
+using System.Web;
+using log4net;
-using OpenMetaverse;
+using Nini.Config;
-using OpenMetaverse.StructuredData;
+using OpenMetaverse;
-using OpenMetaverse.Packets;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
-using log4net;
+using OpenSim.Framework.Communications.Capabilities;
-using Nini.Config;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Capabilities;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
-using OpenSim.Framework.Servers;
+using OSDArray=OpenMetaverse.StructuredData.OSDArray;
-using OpenSim.Region.Framework.Interfaces;
+using OSDMap=OpenMetaverse.StructuredData.OSDMap;
-using OpenSim.Region.Framework.Scenes;
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 namespace OpenSim.Region.CoreModules.InterGrid
 {
    public struct OGPState
@@ -360,7 +355,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
        // Using OpenSim.Framework.Communications.Capabilities.Caps here one time..   
        // so the long name is probably better then a using statement
-        public void OnRegisterCaps(UUID agentID, OpenSim.Framework.Communications.Capabilities.Caps caps)
+        public void OnRegisterCaps(UUID agentID, Caps caps)
        {
            /* If we ever want to register our own caps here....    
             * 
@@ -558,7 +553,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
            string rezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/rez";
            string derezAvatarPath = "/agent/" + AvatarRezCapUUID + "/rez_avatar/derez";
            // Get a reference to the user's cap so we can pull out the Caps Object Path
-            OpenSim.Framework.Communications.Capabilities.Caps userCap 
+            Caps userCap 
                = homeScene.CapsModule.GetCapsHandlerForUser(agentData.AgentID);
            string rezHttpProtocol = "http://";
@@ -683,7 +678,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
                if (homeScene != null)
                {
                    // Get a referenceokay -  to their Cap object so we can pull out the capobjectroot
-                    OpenSim.Framework.Communications.Capabilities.Caps userCap 
+                    Caps userCap 
                        = homeScene.CapsModule.GetCapsHandlerForUser(userData.AgentID);
                    //Update the circuit data in the region so this user is authorized
@@ -889,7 +884,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
                    ShutdownConnection(LocalID,this);
                    // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS
-                    System.Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString());
+                    Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString());
                    return responseMap;
                }
                else
@@ -1202,7 +1197,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
        private string CreateRandomStr(int len)
        {
-            Random rnd = new Random(System.Environment.TickCount);
+            Random rnd = new Random(Environment.TickCount);
            string returnstring = "";
            string chars = "abcdefghijklmnopqrstuvwxyz0123456789";
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index e6a12a4..c62930c 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -25,17 +25,17 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using OpenMetaverse;
+using Nini.Config;
-using OpenMetaverse.Imaging;
+using OpenMetaverse;
-using Nini.Config;
+using OpenMetaverse.Imaging;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 {
    public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index c23ff1e..2e33d46 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -25,19 +25,18 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Reflection;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Reflection;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
-using OpenMetaverse;
+using DotNetOpenMail;
-using OpenSim.Framework;
+using DotNetOpenMail.SmtpAuth;
-using OpenSim.Region.Framework.Interfaces;
+using log4net;
-using OpenSim.Region.Framework.Scenes;
+using Nini.Config;
-using log4net;
+using OpenMetaverse;
-using Nini.Config;
+using OpenSim.Region.Framework.Interfaces;
-using DotNetOpenMail;
+using OpenSim.Region.Framework.Scenes;
-using DotNetOpenMail.SmtpAuth;
 namespace OpenSim.Region.CoreModules.Scripting.EmailModules
 {
    public class EmailModule : IEmailModule
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 9f3bd09..fdd2664 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -25,20 +25,19 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Net;
+using System.Net;
-using System.Text;
+using System.Text;
-using System.Threading;
+using System.Threading;
-using OpenMetaverse;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
-using System.Collections;
 /*****************************************************
 *
 * ScriptsHttpRequests
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index afcaff1..a3e6543 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -25,16 +25,16 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Drawing;
+using System.Drawing;
-using System.IO;
+using System.IO;
-using System.Net;
+using System.Net;
-using OpenMetaverse;
+using Nini.Config;
-using OpenMetaverse.Imaging;
+using OpenMetaverse;
-using Nini.Config;
+using OpenMetaverse.Imaging;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 {
    public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index 0c709b5..c68d8bb 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -25,18 +25,18 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using System.Globalization;
+using System.Globalization;
-using System.IO;
+using System.IO;
-using System.Net;
+using System.Net;
-using OpenMetaverse;
+using Nini.Config;
-using OpenMetaverse.Imaging;
+using OpenMetaverse;
-using Nini.Config;
+using OpenMetaverse.Imaging;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 //using Cairo;
 namespace OpenSim.Region.CoreModules.Scripting.VectorRender
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index c363940..8e7a49f 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -25,15 +25,15 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenMetaverse;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 // using log4net;
 // using System.Reflection;
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 942c130..6476bcc 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -25,21 +25,20 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Net;
+using System.Reflection;
-using System.Reflection;
+using System.Threading;
-using System.Threading;
+using log4net;
-using OpenMetaverse;
+using Nini.Config;
-using log4net;
+using Nwc.XmlRpc;
-using Nini.Config;
+using OpenMetaverse;
-using Nwc.XmlRpc;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
 /*****************************************************
 *
 * XMLRPCModule
@@ -667,7 +666,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
                if (resp != null)
                {
                    Hashtable respParms;
-                    if (resp.Value.GetType().Equals(typeof(System.Collections.Hashtable)))
+                    if (resp.Value.GetType().Equals(typeof(Hashtable)))
                    {
                        respParms = (Hashtable) resp.Value;
                    }
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
index 179d1a2..bc54eb6 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveConstants.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenMetaverse;
+using OpenMetaverse;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 0cc1f86..3efb457 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,21 +25,21 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
-using System.Reflection;
+using System.Net;
-using System.Xml;
+using System.Reflection;
-using System.Net;
+using System.Text;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+        private static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
        private Scene m_scene;                        
        private Stream m_loadStream;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index d3c2cd1..c2ed257 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -25,19 +25,18 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using System.Xml;
+using System.Xml;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Terrain;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index ee0ec69..ba4d51b 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -25,23 +25,20 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Framework;
+using System;
-using OpenSim.Framework.Communications.Cache;
+using System.Collections.Generic;
-using OpenSim.Region.Framework.Interfaces;
+using System.IO;
-using OpenSim.Region.Framework.Scenes;
+using System.IO.Compression;
-using OpenSim.Region.CoreModules.World.Serialiser;
+using System.Reflection;
-using OpenSim.Region.CoreModules.World.Terrain;
+using System.Text.RegularExpressions;
-using System;
+using System.Threading;
-using System.Collections.Generic;
+using log4net;
-using System.IO;
+using OpenMetaverse;
-using System.IO.Compression;
+using OpenSim.Framework;
-using System.Reflection;
+using OpenSim.Region.CoreModules.World.Terrain;
-using System.Text.RegularExpressions;
+using OpenSim.Region.Framework.Interfaces;
-using System.Threading;
+using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index dd65e83..eeb5acd 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -25,18 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Collections.Generic;
+using System.IO;
-using System.IO;
+using System.Reflection;
-using System.Reflection;
+using log4net;
-using System.Threading;
+using Nini.Config;
-using OpenMetaverse;
+using OpenSim.Region.Framework.Interfaces;
-using log4net;
+using OpenSim.Region.Framework.Scenes;
-using Nini.Config;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Serialiser;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index 76d27ce..5488262 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -25,14 +25,14 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using System.Xml;
+using System.Xml;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
index f9909d9..39d2591 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsDearchiver.cs
@@ -25,16 +25,16 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using System.Xml;
+using System.Text;
-using OpenMetaverse;
+using System.Xml;
-using log4net;
+using log4net;
-using OpenSim.Framework;
+using OpenMetaverse;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        protected static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
+        protected static ASCIIEncoding m_asciiEncoding = new ASCIIEncoding();
        /// <summary>
        /// Store for asset data we received before we get the metadata
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 8971b6e..659a7ce 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,17 +25,14 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using System.Threading;
+using System.Threading;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
index 3e3e74a..94845cb 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/RegionSettingsSerializer.cs
@@ -25,13 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System.IO;
-using System.IO;
+using System.Text;
-using System.Text;
+using System.Xml;
-using System.Xml;
+using OpenMetaverse;
-using OpenMetaverse;
+using OpenSim.Framework;
-using OpenSim.Framework;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
index 506d770..983814d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveReader.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,12 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Text;
-using System.Text;
-using log4net;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
index 437939e..8e59983 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/TarArchiveWriter.cs
@@ -25,13 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Text;
+using System.Text;
-using System.Reflection;
-using log4net;
 namespace OpenSim.Region.CoreModules.World.Archiver
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index f201e74..1ad7e9e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -25,20 +25,19 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.Threading;
+using System.Threading;
-using NUnit.Framework;
+using log4net.Config;
-using NUnit.Framework.SyntaxHelpers;
+using NUnit.Framework;
-using OpenMetaverse;
+using NUnit.Framework.SyntaxHelpers;
-using OpenSim.Framework;
+using OpenMetaverse;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
-using OpenSim.Region.CoreModules.World.Archiver;
+using OpenSim.Region.CoreModules.World.Serialiser;
-using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common.Setup;
-using OpenSim.Tests.Common.Setup;
 namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 {
    [TestFixture]
@@ -222,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
        [Test]
        public void TestMergeOarV0p2()
        {
-            log4net.Config.XmlConfigurator.Configure();
+            XmlConfigurator.Configure();
            
            MemoryStream archiveWriteStream = new MemoryStream();
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 8b15308..cc3db3f 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -24,17 +24,19 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Threading;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using OpenMetaverse;
+using System.Security;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenMetaverse;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Estate
 {
    public class EstateManagementModule : IEstateModule
@@ -458,36 +460,36 @@ namespace OpenSim.Region.CoreModules.World.Estate
                TerrainUploader = null;
            }
            remoteClient.SendAlertMessage("Terrain Upload Complete. Loading....");
-            OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
+            ITerrainModule terr = m_scene.RequestModuleInterface<ITerrainModule>();
            if (terr != null)
            {
                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + m_scene.RegionInfo.RegionName);
-                if (System.IO.File.Exists(Util.dataDir() + "/terrain.raw"))
+                if (File.Exists(Util.dataDir() + "/terrain.raw"))
                {
-                    System.IO.File.Delete(Util.dataDir() + "/terrain.raw");
+                    File.Delete(Util.dataDir() + "/terrain.raw");
                }
                try
                {
-                    System.IO.FileStream input = new System.IO.FileStream(Util.dataDir() + "/terrain.raw", System.IO.FileMode.CreateNew);
+                    FileStream input = new FileStream(Util.dataDir() + "/terrain.raw", FileMode.CreateNew);
                    input.Write(terrainData, 0, terrainData.Length);
                    input.Close();
                }
-                catch (System.IO.IOException e)
+                catch (IOException e)
                {
                    m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools.  It gave us the following error: {0}", e.ToString());
                    remoteClient.SendAlertMessage("There was an IO Exception loading your terrain.  Please check free space");
                    return;
                }
-                catch (System.Security.SecurityException e)
+                catch (SecurityException e)
                {
                    m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools.  It gave us the following error: {0}", e.ToString());
                    remoteClient.SendAlertMessage("There was a security Exception loading your terrain.  Please check the security on the simulator drive");
                    return;
                }
-                catch (System.UnauthorizedAccessException e)
+                catch (UnauthorizedAccessException e)
                {
                    m_log.ErrorFormat("[TERRAIN]: Error Saving a terrain file uploaded via the estate tools.  It gave us the following error: {0}", e.ToString());
                    remoteClient.SendAlertMessage("There was a security Exception loading your terrain.  Please check the security on the simulator drive");
@@ -544,18 +546,18 @@ namespace OpenSim.Region.CoreModules.World.Estate
        private void handleTerrainRequest(IClientAPI remote_client, string clientFileName)
        {
            // Save terrain here
-            OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
+            ITerrainModule terr = m_scene.RequestModuleInterface<ITerrainModule>();
            
            if (terr != null)
            {
                m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + m_scene.RegionInfo.RegionName);
-                if (System.IO.File.Exists(Util.dataDir() + "/terrain.raw"))
+                if (File.Exists(Util.dataDir() + "/terrain.raw"))
                {
-                    System.IO.File.Delete(Util.dataDir() + "/terrain.raw");
+                    File.Delete(Util.dataDir() + "/terrain.raw");
                }
                terr.SaveToFile(Util.dataDir() + "/terrain.raw");
-                System.IO.FileStream input = new System.IO.FileStream(Util.dataDir() + "/terrain.raw", System.IO.FileMode.Open);
+                FileStream input = new FileStream(Util.dataDir() + "/terrain.raw", FileMode.Open);
                byte[] bdata = new byte[input.Length];
                input.Read(bdata, 0, (int)input.Length);
                remote_client.SendAlertMessage("Terrain file written, starting download...");
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
index 94a4072..309a7ae 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
@@ -25,16 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.IO;
+using OpenMetaverse;
-using System.Reflection;
+using OpenSim.Framework;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Estate
 {
diff --git a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
index 41163a0..98d4076 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandChannel.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,13 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using OpenMetaverse;
-using OpenMetaverse;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Land
 {
    public class LandChannel : ILandChannel
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 6ae6576..3ee2267 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,21 +25,21 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Framework;
+using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework.Communications.Capabilities;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.Manager;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.CoreModules.World.Land
 {
    // used for caching
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index fc5bef1..8775a85 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,15 +25,15 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Land
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 6e0f8cb..d970579 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -25,20 +25,17 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenMetaverse;
+using System;
-using Nini.Config;
+using System.Collections.Generic;
-using System;
+using System.Reflection;
-using System.Collections;
+using log4net;
-using System.Collections.Generic;
+using Nini.Config;
-using System.Reflection;
+using OpenMetaverse;
-using log4net;
+using OpenSim.Framework;
-using OpenSim;
+using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.Framework;
-using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.CoreModules.World.Permissions
 {
    public class PermissionsModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
index acc7bb8..ef60dd0 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/IFileSerialiser.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
    internal interface IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
index ed6448f..76ae9f0 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseObjects.cs
@@ -25,13 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
-using System.Text;
+using System.Text;
-using System.Xml;
+using System.Xml;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
    internal class SerialiseObjects : IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
index 924218a..47b8d36 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiseTerrain.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
+using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
    internal class SerialiseTerrain : IFileSerialiser
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
index 7080d5f..d687e23 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs
@@ -25,15 +25,15 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using OpenMetaverse;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Serialiser
 {
    public class SerialiserModule : IRegionModule, IRegionSerialiserModule
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index ffd6b8d..c9333c7 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -25,15 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Reflection;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using log4net;
+using OpenSim.Framework;
-using OpenMetaverse;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Sound
 {        
    public class SoundModule : IRegionModule, ISoundModule
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index b36684c..060fda6 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -25,20 +25,22 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenMetaverse;
+using System.Reflection;
-using Nini.Config;
+using log4net;
-using OpenSim.Framework;
+using Nini.Config;
-using OpenSim.Region.Framework.Interfaces;
+using OpenMetaverse;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules
 {
    public class SunModule : 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 const double SeasonalTilt   =  0.03 * Math.PI;  // A daily shift of approximately 1.7188 degrees
        private const double AverageTilt    = -0.25 * Math.PI;  // A 45 degree tilt
@@ -104,7 +106,7 @@ namespace OpenSim.Region.CoreModules
        private ulong CurrentTime
        {
            get {
-                return (ulong)(((System.DateTime.Now.Ticks) - TicksToEpoch + TicksOffset + LindenHourOffset)/10000000);
+                return (ulong)(((DateTime.Now.Ticks) - TicksToEpoch + TicksOffset + LindenHourOffset)/10000000);
            }
        }
@@ -161,7 +163,7 @@ namespace OpenSim.Region.CoreModules
            // Align ticks with Second Life
-            TicksToEpoch = new System.DateTime(1970,1,1).Ticks;
+            TicksToEpoch = new DateTime(1970,1,1).Ticks;
            // Just in case they don't have the stanzas
            try
diff --git a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
index f96ab88..cf38bca 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
@@ -25,11 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.World.Terrain;
-using OpenSim.Region.CoreModules.World.Terrain;
+using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
-using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects
 {
    public class ChannelDigger : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
index cb8112c..20c25d3 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/CookieCutter.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -24,11 +24,11 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 {
    internal class CookieCutter : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
index da6ee12..e21466c 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/DefaultTerrainGenerator.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -24,10 +24,10 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 {
    internal class DefaultTerrainGenerator : ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
index 4f395b5..630d5a0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,11 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
index cff82d1..704386f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,11 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    internal class GIF : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
index 477c73c..f4d1c76 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,13 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
index f8e31f8..44afed1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs
@@ -25,12 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    public class JPEG : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
index a86ae00..7dbcc50 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs
@@ -25,11 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    public class LLRAW : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
index 0dea282..5a00525 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,11 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    internal class PNG : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
index 178104f..d54f529 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    public class RAW32 : ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
index 220431f..3233ab6 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -25,11 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    internal class TIFF : GenericSystemDrawing
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
index 426708d..82108da 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs
@@ -25,12 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.IO;
+using System.IO;
-using System.Text;
+using System.Text;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
index fe79c0b..feef3df 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/FlattenArea.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
    public class FlattenArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
index 5c0aace..f91ddf2 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/LowerArea.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
    public class LowerArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
index 02f2b53..599951d 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/NoiseArea.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
    public class NoiseArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
index 768b31f..4eaae4b 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RaiseArea.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
    public class RaiseArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
index 66b9055..2c31ca9 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/RevertArea.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
    public class RevertArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
index a75dde1..3c44fb0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/FloodBrushes/SmoothArea.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
 {
    public class SmoothArea : ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
index 40b9f5a..b6edde1 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainEffect.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain
 {
    public interface ITerrainEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
index eee7a83..41f31f8 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainFloodEffect.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain
 {
    public interface ITerrainFloodEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
index c62b897..4cee9f5 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainLoader.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.IO;
+using System.IO;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain
 {
    public interface ITerrainLoader
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
index 8c5d1d9..807a4a7 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainModule.cs
@@ -26,10 +26,9 @@
 */
-using System.IO;
+using System.IO;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenSim.Framework;
 namespace OpenSim.Region.CoreModules.World.Terrain
 {
    public interface ITerrainModule
diff --git a/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
index 15d9f6e..8e4ffe0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/ITerrainPaintableEffect.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain
 {
    public interface ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
index 6ce6994..10d015f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/ErodeSphere.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 928a595..d6a3b8e 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    public class FlattenSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
index 8c40088..407fd89 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/LowerSphere.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    public class LowerSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
index 95a8c33..34f5d94 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/NoiseSphere.cs
@@ -25,11 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using OpenSim.Framework;
-using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    public class NoiseSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
index 1a2528a..1207723 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/OlsenSphere.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
index c53bb7d..7df751f 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RaiseSphere.cs
@@ -25,10 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    public class RaiseSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
index 4ed8a13..b156565 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/RevertSphere.cs
@@ -25,10 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    public class RevertSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
index 6636d8f..346e5de 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    public class SmoothSphere : ITerrainPaintableEffect
diff --git a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
index 6b00cc8..33970be 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/PaintBrushes/WeatherSphere.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
 {
    /// <summary>
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
index ff9b8ec..1769dc0 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainException.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
 namespace OpenSim.Region.CoreModules.World.Terrain
 {
    public class TerrainException : Exception
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 9de7338..8aa8ecc 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -25,21 +25,21 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.IO;
+using System.IO;
-using System.Reflection;
+using System.Reflection;
-using OpenMetaverse;
+using log4net;
-using log4net;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
-using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
+using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
-using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
-using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain
 {
    public class TerrainModule : IRegionModule, ICommandableModule, ITerrainModule
diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
index e7f92d7..eea4ed4 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
@@ -25,11 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using NUnit.Framework;
+using NUnit.Framework;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
-using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Terrain.Tests
 {
    [TestFixture]
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index 8b2bb1e..e9d1dc3 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -25,17 +25,15 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Reflection;
+using System.Reflection;
-using log4net;
+using log4net;
-using Nini.Config;
+using Nini.Config;
-using OpenMetaverse;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Vegetation
 {
    public class VegetationModule : IRegionModule, IVegetationModule
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index b8bd605..ebc7e00 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -25,14 +25,14 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenMetaverse;
+using Nini.Config;
-using Nini.Config;
+using OpenMetaverse;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules
 {
    public class WindModule : IWindModule
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules
        private int m_frame = 0;
        private int m_frame_mod = 150;
-        private Random rndnums = new Random(System.Environment.TickCount);
+        private Random rndnums = new Random(Environment.TickCount);
        private Scene m_scene = null;
        private bool ready = false;
        private Vector2[] windSpeeds = new Vector2[16 * 16];
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
index 3684df0..eaf43d3 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/IMapTileTerrainRenderer.cs
@@ -25,10 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Drawing;
+using System.Drawing;
-using OpenSim.Region.Framework.Scenes;
+using Nini.Config;
-using Nini.Config;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
    public interface IMapTileTerrainRenderer
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index eea6cf6..188915d 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -25,20 +25,17 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Drawing;
-using System.Drawing;
+using System.Reflection;
-using System.Drawing.Drawing2D;
+using log4net;
-using System.Drawing.Imaging;
+using Nini.Config;
-using System.Reflection;
+using OpenMetaverse;
-using Nini.Config;
+using OpenMetaverse.Imaging;
-using OpenMetaverse.Imaging;
+using OpenSim.Region.Framework.Interfaces;
-using log4net;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
    public enum DrawRoutine
@@ -208,7 +205,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        {
            int tc = 0;
            double[,] hm = whichScene.Heightmap.GetDoubles();
-            tc = System.Environment.TickCount;
+            tc = Environment.TickCount;
            m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
            List<EntityBase> objs = whichScene.GetEntities();
            Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>();
@@ -525,7 +522,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                g.Dispose();
            } // lock entities objs
-            m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (System.Environment.TickCount - tc) + " ms");
+            m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
            return mapbmp;
        }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index 45a99a9..bd7e140 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -24,18 +24,16 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System.Collections.Generic;
-using System.Reflection;
+using System.Reflection;
-using System.Collections.Generic;
+using log4net;
-using System.Net;
+using Nini.Config;
-using OpenSim.Framework;
+using OpenMetaverse;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes.Hypergrid;
+using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
+using OpenSim.Region.Framework.Scenes.Hypergrid;
-using log4net;
-using Nini.Config;
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
    public class MapSearchModule : IRegionModule
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
index b783d7c..501c826 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/ShadedMapTileRenderer.cs
@@ -25,20 +25,13 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Drawing;
-using System.Collections.Generic;
+using System.Reflection;
-using System.Drawing;
+using log4net;
-using System.Drawing.Drawing2D;
+using Nini.Config;
-using System.Drawing.Imaging;
+using OpenSim.Region.Framework.Scenes;
-using System.Reflection;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using Nini.Config;
-using log4net;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
    public class ShadedMapTileRenderer : IMapTileTerrainRenderer
@@ -57,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        public void TerrainToBitmap(Bitmap mapbmp)
        {
-            int tc = System.Environment.TickCount;
+            int tc = Environment.TickCount;
            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
            double[,] hm = m_scene.Heightmap.GetDoubles();
@@ -151,7 +144,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                        hfdiffihighlight = hfdiffihighlight + Math.Abs((int)(((hfdiff * highlightfactor) % 1f) * 5f) - 1);
                                    }
                                }
-                                catch (System.OverflowException)
+                                catch (OverflowException)
                                {
                                    m_log.Debug("[MAPTILE]: Shadow failed at value: " + hfdiff.ToString());
                                    ShadowDebugContinue = false;
@@ -199,7 +192,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                                }
                            }
                        }
-                        catch (System.ArgumentException)
+                        catch (ArgumentException)
                        {
                            if (!terraincorruptedwarningsaid)
                            {
@@ -230,7 +223,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                            Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255);
                            mapbmp.SetPixel(x, yr, water);
                        }
-                        catch (System.ArgumentException)
+                        catch (ArgumentException)
                        {
                            if (!terraincorruptedwarningsaid)
                            {
@@ -243,7 +236,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                    }
                }
            }
-            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
+            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
index 537644a..dc59d9e 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs
@@ -25,22 +25,17 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections.Generic;
-using System.Collections.Generic;
+using System.Drawing;
-using System.Drawing;
+using System.Reflection;
-using System.Drawing.Drawing2D;
+using log4net;
-using System.Drawing.Imaging;
+using Nini.Config;
-using System.Reflection;
+using OpenMetaverse;
-using OpenMetaverse;
+using OpenMetaverse.Imaging;
-using Nini.Config;
+using OpenSim.Framework;
-using log4net;
+using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse.Imaging;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Terrain;
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
    // Hue, Saturation, Value; used for color-interpolation
@@ -269,7 +264,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        public void TerrainToBitmap(Bitmap mapbmp)
        {
-            int tc = System.Environment.TickCount;
+            int tc = Environment.TickCount;
            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
            // These textures should be in the AssetCache anyway, as every client conneting to this
@@ -405,7 +400,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                    }
                }
            }
-            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
+            m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
        }
    }
 }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 376e365..b372988 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -25,33 +25,29 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
+using System;
-using System.Collections;
+using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Drawing;
+using System.Drawing;
-using System.Drawing.Imaging;
+using System.Drawing.Imaging;
-using System.IO;
+using System.IO;
-using System.Net;
+using System.Net;
-using System.Reflection;
+using System.Reflection;
-using System.Threading;
+using System.Threading;
-using OpenMetaverse;
+using log4net;
-using OpenMetaverse.Imaging;
+using Nini.Config;
-using OpenMetaverse.StructuredData;
+using OpenMetaverse;
-using log4net;
+using OpenMetaverse.Imaging;
-using Nini.Config;
+using OpenMetaverse.StructuredData;
-using OpenSim.Framework;
+using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
+using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Framework.Communications.Capabilities;
+using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
-using OpenSim.Region.Framework.Scenes.Types;
+using OSDArray=OpenMetaverse.StructuredData.OSDArray;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
+using OSDMap=OpenMetaverse.StructuredData.OSDMap;
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
    public class WorldMapModule : IRegionModule
@@ -329,7 +325,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                {    
                    // Local Map Item Request
                    List<ScenePresence> avatars = m_scene.GetAvatars();
-                    int tc = System.Environment.TickCount;
+                    int tc = Environment.TickCount;
                    List<mapItemReply> mapitems = new List<mapItemReply>();
                    mapItemReply mapitem = new mapItemReply();
                    if (avatars.Count == 0 || avatars.Count == 1)
@@ -554,7 +550,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                    lock (m_blacklistedregions)
                    {
                        if (!m_blacklistedregions.ContainsKey(regionhandle))
-                            m_blacklistedregions.Add(regionhandle, System.Environment.TickCount);
+                            m_blacklistedregions.Add(regionhandle, Environment.TickCount);
                    }
                    m_log.InfoFormat("[WORLD MAP]: Blacklisted region {0}", regionhandle.ToString());
                }
@@ -610,7 +606,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                lock (m_blacklistedurls)
                {
                    if (!m_blacklistedurls.ContainsKey(httpserver))
-                        m_blacklistedurls.Add(httpserver, System.Environment.TickCount);
+                        m_blacklistedurls.Add(httpserver, Environment.TickCount);
                }
                m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
@@ -639,7 +635,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                    lock (m_blacklistedurls)
                    {
                        if (!m_blacklistedurls.ContainsKey(httpserver))
-                            m_blacklistedurls.Add(httpserver, System.Environment.TickCount);
+                            m_blacklistedurls.Add(httpserver, Environment.TickCount);
                    }
                    m_log.WarnFormat("[WORLD MAP]: Blacklisted {0}", httpserver);
@@ -804,7 +800,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            List<ScenePresence> avatars = m_scene.GetAvatars();
            OSDArray responsearr = new OSDArray(avatars.Count);
            OSDMap responsemapdata = new OSDMap();
-            int tc = System.Environment.TickCount;
+            int tc = Environment.TickCount;
            /* 
            foreach (ScenePresence av in avatars)
            {
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 9af8914..82b3826 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -26,16 +26,15 @@
 *
 */
-using System;
 using System.Collections;
 using System.Reflection;
 using System.Xml;
 using log4net;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Framework.Communications.Capabilities;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 using OpenMetaverse;
+using OpenSim.Framework.Communications.Capabilities;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Scenes;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.DataSnapshot
 {
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 735e14b..3013971 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -31,17 +31,15 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Reflection;
-using System.Text;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse.Packets;
 namespace OpenSim.Region.DataSnapshot
 {
@@ -51,7 +49,7 @@ namespace OpenSim.Region.DataSnapshot
        //Information from config
        private bool m_enabled = false;
        private bool m_configLoaded = false;
-        private List<String> m_disabledModules = new List<String>();
+        private List<string> m_disabledModules = new List<string>();
        private Dictionary<string, string> m_gridinfo = new Dictionary<string, string>();
        private string m_snapsDir = "DataSnapshot";
        private string m_exposure_level = "minimum";
@@ -123,7 +121,7 @@ namespace OpenSim.Region.DataSnapshot
                        {
                            m_disabledModules.Add(bloody_wanker);
                        }
-                        m_lastUpdate = System.Environment.TickCount;
+                        m_lastUpdate = Environment.TickCount;
                    }
                    catch (Exception)
                    {
@@ -363,26 +361,26 @@ namespace OpenSim.Region.DataSnapshot
        private void CheckStale()
        {
            // Wrap check
-            if (System.Environment.TickCount < m_lastUpdate)
+            if (Environment.TickCount < m_lastUpdate)
            {
-                m_lastUpdate = System.Environment.TickCount;
+                m_lastUpdate = Environment.TickCount;
            }
            if (m_stales >= m_maxStales)
            {
-                if (System.Environment.TickCount - m_lastUpdate >= 20000)
+                if (Environment.TickCount - m_lastUpdate >= 20000)
                {
                    m_stales = 0;
-                    m_lastUpdate = System.Environment.TickCount;
+                    m_lastUpdate = Environment.TickCount;
                    MakeEverythingStale();
                }
            }
            else
            {
-                if (m_lastUpdate + 1000 * m_period < System.Environment.TickCount)
+                if (m_lastUpdate + 1000 * m_period < Environment.TickCount)
                {
                    m_stales = 0;
-                    m_lastUpdate = System.Environment.TickCount;
+                    m_lastUpdate = Environment.TickCount;
                    MakeEverythingStale();
                }
            }
diff --git a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
index e805e5b..36f93a3 100644
--- a/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshot.cs
@@ -25,9 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Xml;
 namespace OpenSim.Region.DataSnapshot.Interfaces
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
index 73e41ee..6c66922 100644
--- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
+++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs
@@ -25,7 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using OpenSim.Framework.Communications.Capabilities;
 namespace OpenSim.Region.DataSnapshot
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 52659e4..fea9f9b 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -29,15 +29,14 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
-using OpenMetaverse;
 using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.CoreModules.World.Land;
 using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse.Packets;
-using OpenSim.Framework.Communications.Cache;
 namespace OpenSim.Region.DataSnapshot.Providers
 {
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index 949cc38..7cca6ad 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -30,12 +30,11 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Xml;
 using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
 using OpenSim.Region.DataSnapshot.Interfaces;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Land;
-using OpenSim.Framework;
-using OpenMetaverse;
 namespace OpenSim.Region.DataSnapshot.Providers
 {
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index 22fe067..9886995 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -27,12 +27,13 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Xml;
-using System.IO;
+using log4net;
-using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.DataSnapshot.Interfaces;
-using OpenMetaverse;
+using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.DataSnapshot
 {
@@ -42,7 +43,7 @@ namespace OpenSim.Region.DataSnapshot
        private String m_directory = "unyuu"; //not an attempt at adding RM references to core SVN, honest
        private Dictionary<Scene, bool> m_scenes = null;
        private List<IDataSnapshotProvider> m_providers = null;
-        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, String> m_gridinfo = null;
        private bool m_cacheEnabled = true;
        private string m_listener_port = "9000"; //TODO: Set default port over 9000
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 6c9cf2c..90269cf 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -26,9 +26,8 @@
 */
 using System.Collections.Generic;
-using System.IO;
-using OpenMetaverse;
 using Nini.Config;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
index 49a5dd0..b41ba9e 100644
--- a/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs
@@ -27,7 +27,6 @@
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
index b533206..d39fff9 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
@@ -27,7 +27,6 @@
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
index bac0b2e..ddc62d2 100644
--- a/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs
@@ -25,11 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index 7247d52..d6f3340 100644
--- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -25,7 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using OpenMetaverse;
 using OpenSim.Framework;
diff --git a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
index b5f885a..f06fbc8 100644
--- a/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs
@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 20fe090..69b2bad 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -25,15 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Collections.Generic;
-using System.Reflection;
 using OpenMetaverse;
-using log4net;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes.Scripting;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
index 4da115e..faa9002 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
@@ -25,9 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
+using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index f169f61..59f68ef 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index cf609ae..b8874e3 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -25,14 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Net;
-using OpenSim.Framework;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenMetaverse.StructuredData;
-using System.Collections.Generic;
-using System.Text;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
index 16527d1..67c88dd 100644
--- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
@@ -25,10 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Collections.Generic;
-using OpenSim.Framework;
 using OpenMetaverse;
+using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index fd49757..e552270 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -25,9 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Collections.Generic;
-using System.Net;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
index bfa17fc..06ef1aa 100644
--- a/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
@@ -25,9 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
+using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
index 0e1e851..f68807a 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
@@ -25,8 +25,8 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.IO;
+using System.IO;
 namespace OpenSim.Region.Framework.Interfaces
 {        
    public interface IInventoryArchiverModule
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
index 4314271..716d7a8 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs
@@ -25,7 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
index 35c2fc1..341dd3e 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs
@@ -28,7 +28,6 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
index f0a5473..ffae307 100644
--- a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
@@ -25,9 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using OpenSim.Framework;
-using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
index 011f8bb..85bc4da 100644
--- a/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IPresenceModule.cs
@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
index 40e4c99..02174f8 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs
@@ -25,9 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using OpenMetaverse;
 using System.Collections.Generic;
 using System.IO;
+using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
index 79a43d6..c713cc3 100644
--- a/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISceneObject.cs
@@ -1,4 +1,3 @@
-using System;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 65620d3..6ba0068 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 91c80e3..078139d 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -26,7 +26,6 @@
 */
 using System;
-using Nini.Config;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
index 96b303f..5b8b0ce 100644
--- a/OpenSim/Region/Framework/Interfaces/IWindModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs
@@ -25,8 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
-using OpenSim.Framework;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
diff --git a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
index cdd2b7c..d6f9819 100644
--- a/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
@@ -26,7 +26,6 @@
 */
 using OpenMetaverse;
-using Nwc.XmlRpc;
 namespace OpenSim.Region.Framework.Interfaces
 {
diff --git a/OpenSim/Region/Framework/Scenes/Animation.cs b/OpenSim/Region/Framework/Scenes/Animation.cs
index 3504717..cb0afa7 100644
--- a/OpenSim/Region/Framework/Scenes/Animation.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation.cs
@@ -25,7 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
index f53bb78..49bcda8 100644
--- a/OpenSim/Region/Framework/Scenes/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
@@ -25,7 +25,6 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-using System;
 using System.Collections.Generic;
 using OpenMetaverse;
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index 178f1f7..7f2ac63 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -31,7 +31,6 @@ using System.Reflection;
 using System.Timers;
 using log4net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Scenes
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index a322766..504b90a 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -32,7 +32,6 @@ using System.Reflection;
 using log4net;
 using OpenMetaverse;
 namespace OpenSim.Region.Framework.Scenes
 {
    public class EntityManager : IEnumerable<EntityBase>
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 23e1278..9d47f87 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -26,13 +26,12 @@
 */
 using System;
+using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
 using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-using System.Collections.Generic;
 namespace OpenSim.Region.Framework.Scenes
 {
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index cc82a48..4039288 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -27,20 +27,13 @@
 */
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
 using log4net;
-using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Scenes;
 //using HyperGrid.Framework;
 //using OpenSim.Region.Communications.Hypergrid;
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
index 7249029..ad98273 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGHyperlink.cs
@@ -26,13 +26,11 @@
 */
 using System;
-using System.Reflection;
 using System.Net;
-using OpenSim.Framework;
+using System.Reflection;
-using OpenSim.Framework.Communications;
-using OpenMetaverse;
 using log4net;
-using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index c6d2bfc..ea03cf9 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -26,21 +26,13 @@
 * 
 */
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Reflection;
-using System.Threading;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
-using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index 1cb98db..558dfb4 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -26,15 +26,9 @@
 * 
 */
-using System;
-using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Framework.Scenes;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index a17df71..f75ea8e 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -33,12 +33,10 @@ using System.Reflection;
 using System.Threading;
 using log4net;
 using OpenMetaverse;
-using OSD = OpenMetaverse.StructuredData.OSD;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.Framework.Scenes.Hypergrid
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 848b497..e2eb89e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -30,26 +30,22 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Xml;
+using System.Text;
 using System.Threading;
 using System.Timers;
+using System.Xml;
+using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
-using OpenMetaverse.Packets;
 using OpenSim.Framework;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
+using OpenSim.Framework.Console;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
-using Nini.Config;
+using Timer=System.Timers.Timer;
-using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-using Image = System.Drawing.Image;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
-using Timer = System.Timers.Timer;
-using OSD = OpenMetaverse.StructuredData.OSD;
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -776,7 +772,7 @@ namespace OpenSim.Region.Framework.Scenes
            int maintc = 0;
            while (!shuttingdown)
            {
-                maintc = System.Environment.TickCount;
+                maintc = Environment.TickCount;
                TimeSpan SinceLastFrame = DateTime.Now - m_lastupdate;
                // Aquire a lock so only one update call happens at once
@@ -802,7 +798,7 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                }
-                frameMS = System.Environment.TickCount;
+                frameMS = Environment.TickCount;
                try
                {
                    // Increment the frame counter
@@ -812,15 +808,15 @@ namespace OpenSim.Region.Framework.Scenes
                    if (m_frame == Int32.MaxValue)
                        m_frame = 0;
-                    physicsMS2 = System.Environment.TickCount;
+                    physicsMS2 = Environment.TickCount;
                    if ((m_frame % m_update_physics == 0) && m_physics_enabled)
                        m_sceneGraph.UpdatePreparePhysics();
-                    physicsMS2 = System.Environment.TickCount - physicsMS2;
+                    physicsMS2 = Environment.TickCount - physicsMS2;
                    if (m_frame % m_update_entitymovement == 0)
                        m_sceneGraph.UpdateEntityMovement();
-                    physicsMS = System.Environment.TickCount;
+                    physicsMS = Environment.TickCount;
                    if ((m_frame % m_update_physics == 0) && m_physics_enabled)
                        physicsFPS = m_sceneGraph.UpdatePhysics(
                            Math.Max(SinceLastFrame.TotalSeconds, m_timespan)
@@ -828,10 +824,10 @@ namespace OpenSim.Region.Framework.Scenes
                    if (m_frame % m_update_physics == 0 && SynchronizeScene != null)
                        SynchronizeScene(this);
-                    physicsMS = System.Environment.TickCount - physicsMS;
+                    physicsMS = Environment.TickCount - physicsMS;
                    physicsMS += physicsMS2;
-                    otherMS = System.Environment.TickCount;
+                    otherMS = Environment.TickCount;
                    // run through all entities looking for updates (slow)
                    if (m_frame % m_update_entities == 0)
                        m_sceneGraph.UpdateEntities();
@@ -864,7 +860,7 @@ namespace OpenSim.Region.Framework.Scenes
                        if (m_frame % m_update_land == 0)
                            UpdateLand();
-                        otherMS = System.Environment.TickCount - otherMS;
+                        otherMS = Environment.TickCount - otherMS;
                        // if (m_frame%m_update_avatars == 0)
                        //   UpdateInWorldTime();
                        StatsReporter.AddPhysicsFPS(physicsFPS);
@@ -875,7 +871,7 @@ namespace OpenSim.Region.Framework.Scenes
                        StatsReporter.SetChildAgents(m_sceneGraph.GetChildAgentCount());
                        StatsReporter.SetObjects(m_sceneGraph.GetTotalObjectsCount());
                        StatsReporter.SetActiveObjects(m_sceneGraph.GetActiveObjectsCount());
-                        frameMS = System.Environment.TickCount - frameMS;
+                        frameMS = Environment.TickCount - frameMS;
                        StatsReporter.addFrameMS(frameMS);
                        StatsReporter.addPhysicsMS(physicsMS);
                        StatsReporter.addOtherMS(otherMS);
@@ -919,7 +915,7 @@ namespace OpenSim.Region.Framework.Scenes
                    m_lastupdate = DateTime.Now;
                }
-                maintc = System.Environment.TickCount - maintc;
+                maintc = Environment.TickCount - maintc;
                maintc = (int)(m_timespan * 1000) - maintc;
                if ((maintc < (m_timespan * 1000)) && maintc > 0)
@@ -1184,7 +1180,7 @@ namespace OpenSim.Region.Framework.Scenes
            {
                #region Fallback default maptile generation
-                int tc = System.Environment.TickCount;
+                int tc = Environment.TickCount;
                m_log.Info("[MAPTILE]: Generating Maptile Step 1: Terrain");
                Bitmap mapbmp = new Bitmap(256, 256);
                double[,] hm = Heightmap.GetDoubles();
@@ -1301,7 +1297,7 @@ namespace OpenSim.Region.Framework.Scenes
                                                hfdiffi = hfdiffi + Math.Abs((int)(((hfdiff % 1) * 0.5f) * 10f) - 1);
                                            }
                                        }
-                                        catch (System.OverflowException)
+                                        catch (OverflowException)
                                        {
                                            m_log.Debug("[MAPTILE]: Shadow failed at value: " + hfdiff.ToString());
                                            ShadowDebugContinue = false;
@@ -1325,7 +1321,7 @@ namespace OpenSim.Region.Framework.Scenes
                                    }
                                }
                            }
-                            catch (System.ArgumentException)
+                            catch (ArgumentException)
                            {
                                if (!terraincorruptedwarningsaid)
                                {
@@ -1361,7 +1357,7 @@ namespace OpenSim.Region.Framework.Scenes
                                Color water = Color.FromArgb((int)heightvalue, (int)heightvalue, 255);
                                mapbmp.SetPixel(x, (256 - y) - 1, water);
                            }
-                            catch (System.ArgumentException)
+                            catch (ArgumentException)
                            {
                                if (!terraincorruptedwarningsaid)
                                {
@@ -1379,7 +1375,7 @@ namespace OpenSim.Region.Framework.Scenes
                    //m_log.Info("[MAPTILE]: Completed One row in " + tc + " ms");
                }
-                m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (System.Environment.TickCount - tc) + " ms");
+                m_log.Info("[MAPTILE]: Generating Maptile Step 1: Done in " + (Environment.TickCount - tc) + " ms");
                bool drawPrimVolume = true;
@@ -1395,7 +1391,7 @@ namespace OpenSim.Region.Framework.Scenes
                if (drawPrimVolume)
                {
-                    tc = System.Environment.TickCount;
+                    tc = Environment.TickCount;
                    m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
                    List<EntityBase> objs = GetEntities();
@@ -1547,7 +1543,7 @@ namespace OpenSim.Region.Framework.Scenes
                        } // foreach loop over entities
                    } // lock entities objs
-                    m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (System.Environment.TickCount - tc) + " ms");
+                    m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
                } // end if drawPrimOnMaptle
                byte[] data;
@@ -2146,7 +2142,7 @@ namespace OpenSim.Region.Framework.Scenes
                                    string spath = Path.Combine("ScriptEngines", RegionInfo.RegionID.ToString());
                                    spath = Path.Combine(spath, uuid.ToString());
                                    FileStream sfs = File.Create(spath + ".state");
-                                    System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+                                    ASCIIEncoding enc = new ASCIIEncoding();
                                    Byte[] buf = enc.GetBytes(sdoc.InnerXml);
                                    sfs.Write(buf, 0, buf.Length);
                                    sfs.Close();
@@ -2350,7 +2346,7 @@ namespace OpenSim.Region.Framework.Scenes
                CreateAndAddScenePresence(client);
            }
-            m_LastLogin = System.Environment.TickCount;
+            m_LastLogin = Environment.TickCount;
            EventManager.TriggerOnNewClient(client);
        }
@@ -2891,7 +2887,7 @@ namespace OpenSim.Region.Framework.Scenes
                    m_sceneGridService.SendCloseChildAgentConnections(loggingOffUser.UUID, new List<ulong>(loggingOffUser.KnownRegions.Keys));
                    loggingOffUser.ControllingClient.Kick(message);
                    // Give them a second to receive the message!
-                    System.Threading.Thread.Sleep(1000);
+                    Thread.Sleep(1000);
                    loggingOffUser.ControllingClient.Close(true);
                }
                else
@@ -4157,7 +4153,7 @@ namespace OpenSim.Region.Framework.Scenes
            // A login in the last 4 mins? We can't be doing too badly
            //
-            if ((System.Environment.TickCount - m_LastLogin) < 240000)
+            if ((Environment.TickCount - m_LastLogin) < 240000)
                health++;
            return 0;