* Replaced old logging mechanism with new shiny logging mechanism

* Console, I bid thee farewall. Use "Log" now where console used to exist.

2 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 70b14c2..87eff49 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -66,17 +66,17 @@ namespace OpenSim.GridInterfaces.Local
             this._assetRequests = new BlockingQueue<ARequest>();

             yapfile = System.IO.File.Exists("assets.yap");

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Local Asset Server class created");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "Local Asset Server class created");

             try

             {

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

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Db4 Asset database  creation");

+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Db4 Asset database  creation");

             }

             catch (Exception e)

             {

                 db.Close();

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");

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

+                OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");

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

             }

             if (!yapfile)

             {

@@ -124,7 +124,7 @@ namespace OpenSim.GridInterfaces.Local
         {

             if (db != null)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database");

+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Closing local asset server database");

                 db.Close();

             }

         }

@@ -168,7 +168,7 @@ namespace OpenSim.GridInterfaces.Local
             try

             {

 

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database");

+                OpenSim.Framework.Console.MainLog.Instance.Verbose( "Setting up asset database");

 

                 AssetBase Image = new AssetBase();

                 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");

diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index be00fa7..ca01c68 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
@@ -53,7 +53,7 @@ namespace OpenSim.GridInterfaces.Remote
             this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));

             this._remoteAssetServerThread.IsBackground = true;

             this._remoteAssetServerThread.Start();

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Remote Asset Server class created");

+            OpenSim.Framework.Console.MainLog.Instance.Verbose("Remote Asset Server class created");

         }

 

         public void SetReceiver(IAssetReceiver receiver)

@@ -98,7 +98,7 @@ namespace OpenSim.GridInterfaces.Remote
                 // 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM

                 ARequest req = this._assetRequests.Dequeue();

                 LLUUID assetID = req.AssetID;

-              //  OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);

+              //  OpenSim.Framework.Console.MainLog.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);

                 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);

                 WebResponse AssetResponse = AssetLoad.GetResponse();

                 byte[] idata = new byte[(int)AssetResponse.ContentLength];