* optimized usings.

6 files changed, 80 insertions, 101 deletions

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 OpenSim.Region.Framework.Scenes;
-using Nini.Config;
-
+using System.Drawing;

+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.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Reflection;
-using Nini.Config;
-using OpenMetaverse.Imaging;
-using log4net;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenMetaverse;
-
+using System;

+using System.Collections.Generic;

+using System.Drawing;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+

 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.Reflection;
-using System.Collections.Generic;
-using System.Net;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Framework.Scenes.Hypergrid;
-using OpenMetaverse;
-using log4net;
-using Nini.Config;
-
+using System.Collections.Generic;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using OpenSim.Region.Framework.Scenes.Hypergrid;

+

 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.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Reflection;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using Nini.Config;
-using log4net;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
+using System;

+using System.Drawing;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+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.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Reflection;
-using OpenMetaverse;
-using Nini.Config;
-using log4net;
-using OpenMetaverse.Imaging;
-using OpenSim.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.World.Terrain;
-
+using System;

+using System.Collections.Generic;

+using System.Drawing;

+using System.Reflection;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenSim.Framework;

+using OpenSim.Region.Framework.Scenes;

+

 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.Collections;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Threading;
-using OpenMetaverse;
-using OpenMetaverse.Imaging;
-using OpenMetaverse.StructuredData;
-using log4net;
-using Nini.Config;
-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 Caps = OpenSim.Framework.Communications.Capabilities.Caps;
-
-using OSD = OpenMetaverse.StructuredData.OSD;
-using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using OSDArray = OpenMetaverse.StructuredData.OSDArray;
-
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+using System.Net;

+using System.Reflection;

+using System.Threading;

+using log4net;

+using Nini.Config;

+using OpenMetaverse;

+using OpenMetaverse.Imaging;

+using OpenMetaverse.StructuredData;

+using OpenSim.Framework;

+using OpenSim.Framework.Communications.Capabilities;

+using OpenSim.Framework.Servers;

+using OpenSim.Region.Framework.Interfaces;

+using OpenSim.Region.Framework.Scenes;

+using Caps=OpenSim.Framework.Communications.Capabilities.Caps;

+using OSDArray=OpenMetaverse.StructuredData.OSDArray;

+using OSDMap=OpenMetaverse.StructuredData.OSDMap;

+

 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)
             {