* Fixed OGS build

* Converted to new console interfaces
* Fixed other minor issues which somehow snuck in

2 files changed, 17 insertions, 18 deletions

diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
index 3b17cff..d4fe355 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs
@@ -81,7 +81,7 @@ namespace OpenGridServices.UserServer
 

         private void Work()

         {

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"\nEnter help for a list of commands\n");

+            m_console.Notice("Enter help for a list of commands\n");

 

             while (true)

             {

@@ -96,16 +96,16 @@ namespace OpenGridServices.UserServer
             this.ConfigDB(this.localXMLConfig);

             this.localXMLConfig.Close();

 

-            MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration");

+            MainConsole.Instance.Verbose("Main.cs:Startup() - Loading configuration");

             Cfg = this.LoadConfigDll(this.ConfigDll);

             Cfg.InitConfig();

 

-            MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection");

+            MainConsole.Instance.Verbose( "Main.cs:Startup() - Establishing data connection");

             m_userManager = new UserManager();

             m_userManager._config = Cfg;

             m_userManager.AddPlugin(StorageDll);

 

-            MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");

+            MainConsole.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");

             BaseHttpServer httpServer = new BaseHttpServer(8002);

 

             httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);

@@ -144,8 +144,8 @@ namespace OpenGridServices.UserServer
             switch (cmd)

             {

                 case "help":

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"create user - create a new user");

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"shutdown - shutdown the grid (USE CAUTION!)");

+                    m_console.Notice("create user - create a new user");

+                    m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");

                     break;

 

                 case "create":

diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
index 21ecc50..7dd404d 100644
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
@@ -27,10 +27,10 @@ namespace OpenGridServices.UserServer
         /// <param name="FileName">The filename to the user server plugin DLL</param>

         public void AddPlugin(string FileName)

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Attempting to load " + FileName);

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);

             Assembly pluginAssembly = Assembly.LoadFrom(FileName);

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");

             foreach (Type pluginType in pluginAssembly.GetTypes())

             {

                 if (!pluginType.IsAbstract)

@@ -42,7 +42,7 @@ namespace OpenGridServices.UserServer
                         IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));

                         plug.Initialise();

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

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Added IUserData Interface");

+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");

                     }

 

                     typeInterface = null;

@@ -78,7 +78,7 @@ namespace OpenGridServices.UserServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

                 }

             }

         }

@@ -100,7 +100,7 @@ namespace OpenGridServices.UserServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

                 }

             }

 

@@ -125,7 +125,7 @@ namespace OpenGridServices.UserServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

                 }

             }

 

@@ -157,7 +157,7 @@ namespace OpenGridServices.UserServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

                 }

             }

 

@@ -179,7 +179,7 @@ namespace OpenGridServices.UserServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

                 }

             }

 

@@ -201,7 +201,7 @@ namespace OpenGridServices.UserServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

                 }

             }

 

@@ -224,7 +224,7 @@ namespace OpenGridServices.UserServer
                 }

                 catch (Exception e)

                 {

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

+                    OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");

                 }

             }

 

@@ -348,8 +348,7 @@ namespace OpenGridServices.UserServer
         /// <returns>Authenticated?</returns>

         public bool AuthenticateUser(ref UserProfileData profile, string password)

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(

-                OpenSim.Framework.Console.LogPriority.LOW, 

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose(

                 "Authenticating " + profile.username + " " + profile.surname);

 

             password = password.Remove(0, 3); //remove $1$