7 files changed, 22 insertions, 30 deletions

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 OpenSim.Region.Framework.Scenes;
+using log4net;
 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