* Fixed OGS build

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

1 files changed, 8 insertions, 8 deletions

diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
index 334d3c5..de76645 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
@@ -72,7 +72,7 @@ namespace OpenGridServices.AssetServer
 

         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");

 

             while (true)

             {

@@ -88,10 +88,10 @@ namespace OpenGridServices.AssetServer
 

         public void Startup()

         {

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Setting up asset DB");

+            m_console.Verbose( "Main.cs:Startup() - Setting up asset DB");

             setupDB();

 

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

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

             AssetHttpServer httpServer = new AssetHttpServer(8003);

 

 

@@ -121,7 +121,7 @@ namespace OpenGridServices.AssetServer
 

         public string assetGetMethod(string request, string path, string param)

         {

-            Console.WriteLine("got a request " +param);

+            Console.WriteLine("got a request " + param);

             byte[] assetdata = getAssetData(new LLUUID(param), false);

             if (assetdata != null)

             {

@@ -167,13 +167,13 @@ namespace OpenGridServices.AssetServer
             try

             {

                 db = Db4oFactory.OpenFile("assets.yap");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:setupDB() - creation");

+                OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Main.cs:setupDB() - creation");

             }

             catch (Exception e)

             {

                 db.Close();

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs:setupDB() - Exception occured");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Warn("Main.cs:setupDB() - Exception occured");

+                OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());

             }

             if (!yapfile)

             {

@@ -322,7 +322,7 @@ namespace OpenGridServices.AssetServer
             switch (cmd)

             {

                 case "help":

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - shutdown this asset server (USE CAUTION!)");

+                    m_console.Notice("shutdown - shutdown this asset server (USE CAUTION!)");

                     break;

 

                 case "shutdown":