* optimized usings.

34 files changed, 38 insertions, 108 deletions

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 System.Collections.Generic;
+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
 
 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 OpenSim.Framework.Communications;
-using OpenMetaverse;
+using System.Reflection;
 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 Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-using Image = System.Drawing.Image;
+using Timer=System.Timers.Timer;
 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;