3 files changed, 24 insertions, 33 deletions

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index e562721..7986591 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -28,15 +28,14 @@
 using System;

 using System.Collections;

 using System.Collections.Generic;

-using System.Text;

 using System.Reflection;

-using OpenSim.Framework.Data;

-using OpenSim.Framework.Utilities;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Sims;

+using System.Xml;

 using libsecondlife;

 using Nwc.XmlRpc;

-using System.Xml;

+using OpenSim.Framework.Console;

+using OpenSim.Framework.Data;

+using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Utilities;

 

 namespace OpenSim.Grid.GridServer

 {

@@ -45,7 +44,7 @@ namespace OpenSim.Grid.GridServer
         Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();

         Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();

 

-        public OpenSim.Framework.Interfaces.GridConfig config;

+        public GridConfig config;

 

         /// <summary>

         /// Adds a new grid server plugin - grid servers will be requested in the order they were loaded.

@@ -53,10 +52,10 @@ namespace OpenSim.Grid.GridServer
         /// <param name="FileName">The filename to the grid server plugin DLL</param>

         public void AddPlugin(string FileName)

                 {

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);

+            MainLog.Instance.Verbose("Storage: Attempting to load " + FileName);

                         Assembly pluginAssembly = Assembly.LoadFrom(FileName);

 

-            OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

+            MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

                         foreach (Type pluginType in pluginAssembly.GetTypes())

                         {

                 if (!pluginType.IsAbstract)

@@ -69,7 +68,7 @@ namespace OpenSim.Grid.GridServer
                         IGridData plug = (IGridData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

                         plug.Initialise();

                         this._plugins.Add(plug.getName(), plug);

-                        OpenSim.Framework.Console.MainLog.Instance.Verbose("Storage: Added IGridData Interface");

+                        MainLog.Instance.Verbose("Storage: Added IGridData Interface");

                     }

 

                     typeInterface = null;

@@ -82,7 +81,7 @@ namespace OpenSim.Grid.GridServer
                         ILogData plug = (ILogData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

                         plug.Initialise();

                         this._logplugins.Add(plug.getName(), plug);

-                        OpenSim.Framework.Console.MainLog.Instance.Verbose( "Storage: Added ILogData Interface");

+                        MainLog.Instance.Verbose( "Storage: Added ILogData Interface");

                     }

 

                     typeInterface = null;

@@ -110,7 +109,7 @@ namespace OpenSim.Grid.GridServer
                 }

                 catch (Exception)

                 {

-                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);

+                    MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);

                 }

             }

         }

@@ -120,7 +119,7 @@ namespace OpenSim.Grid.GridServer
         /// </summary>

         /// <param name="uuid">A UUID key of the region to return</param>

         /// <returns>A SimProfileData for the region</returns>

-        public SimProfileData getRegion(libsecondlife.LLUUID uuid)

+        public SimProfileData getRegion(LLUUID uuid)

         {

             foreach(KeyValuePair<string,IGridData> kvp in _plugins) {

                 try

@@ -129,7 +128,7 @@ namespace OpenSim.Grid.GridServer
                 }

                 catch (Exception)

                 {

-                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);

+                    MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);

                 }

             }

             return null;

@@ -150,7 +149,7 @@ namespace OpenSim.Grid.GridServer
                 }

                 catch

                 {

-                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);

+                    MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);

                 }

             }

             return null;

@@ -174,7 +173,7 @@ namespace OpenSim.Grid.GridServer
                 }

                 catch

                 {

-                    OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);

+                    MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);

                 }

             }

 

@@ -370,7 +369,7 @@ namespace OpenSim.Grid.GridServer
 

                     simProfileList.Add(simProfileBlock);

                 }

-                OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");

+                MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode");

             }

             else

             {

@@ -403,7 +402,7 @@ namespace OpenSim.Grid.GridServer
                         }

                     }

                 }

-                OpenSim.Framework.Console.MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");

+                MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode");

             }

 

             responseData["sim-profiles"] = simProfileList;

@@ -565,7 +564,7 @@ namespace OpenSim.Grid.GridServer
             

             try

             {

-                OpenSim.Framework.Console.MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");

+                MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered.");

                 foreach (KeyValuePair<string, IGridData> kvp in _plugins)

                 {

                     try

@@ -575,7 +574,7 @@ namespace OpenSim.Grid.GridServer
                         if ((reserveData != null && reserveData.gridRecvKey == TheSim.regionRecvKey) || (reserveData == null))

                         {

                             kvp.Value.AddProfile(TheSim);

-                            OpenSim.Framework.Console.MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");

+                            MainLog.Instance.Verbose("New sim added to grid (" + TheSim.regionName + ")");

                             logToDB(TheSim.UUID.ToStringHyphenated(), "RestSetSimMethod", "", 5, "Region successfully updated and connected to grid.");

                         }

                         else

@@ -585,7 +584,7 @@ namespace OpenSim.Grid.GridServer
                     }

                     catch (Exception e)

                     {

-                        OpenSim.Framework.Console.MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());

+                        MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString());

                     }

                 }

                 return "OK";

diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 490f757..20c4905 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -27,20 +27,14 @@
 */

 

 using System;

-using System.IO;

-using System.Text;

-using System.Timers;

-using System.Net;

-using System.Threading;

 using System.Reflection;

-using libsecondlife;

-using OpenSim.Framework.Manager;

-using OpenSim.Framework;

-using OpenSim.Framework.Sims;

+using System.Threading;

+using System.Timers;

 using OpenSim.Framework.Console;

 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Servers;

 using OpenSim.GenericConfig;

+using Timer=System.Timers.Timer;

 

 namespace OpenSim.Grid.GridServer

 {

@@ -156,7 +150,7 @@ namespace OpenSim.Grid.GridServer
 

             m_console.Verbose( "Main.cs:Startup() - Starting sim status checker");

 

-            System.Timers.Timer simCheckTimer = new System.Timers.Timer(3600000 * 3); // 3 Hours between updates.

+            Timer simCheckTimer = new Timer(3600000 * 3); // 3 Hours between updates.

             simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims);

             simCheckTimer.Enabled = true;

         }

diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
index 303dddf..62a68a8 100644
--- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
@@ -26,9 +26,7 @@
 * 

 */

 using System.Reflection;

-using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

-

 // General Information about an assembly is controlled through the following 

 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.