* Removed MainConsole.Instance.WriteLine completely

* Now exists MainConsole.Instance.Error/Warn/Notice/Verbose -- use those instead
* Removed some instances of System.Console use - aiming to depreciate this in favour of MainConsole completely.

14 files changed, 110 insertions, 102 deletions

diff --git a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
index f66fa80..b98eac9 100644
--- a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -34,6 +34,7 @@ using OpenSim;
 using OpenSim.Framework.Interfaces;

 using OpenSim.Framework.Types;

 using OpenSim.Framework.Utilities;

+using OpenSim.Framework.Console;

 

 namespace OpenSim.Assets

 {

@@ -60,7 +61,7 @@ namespace OpenSim.Assets
         /// </summary>

         public AssetCache(IAssetServer assetServer)

         {

-            Console.WriteLine("Creating Asset cache");

+            MainConsole.Instance.Verbose("Creating Asset cache");

             _assetServer = assetServer;

             _assetServer.SetReceiver(this);

             Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>();

@@ -86,7 +87,7 @@ namespace OpenSim.Assets
                 }

                 catch (Exception e)

                 {

-                    Console.WriteLine(e.Message);

+                    MainConsole.Instance.Error(e.Message);

                 }

             }

         }

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
index 5229dbd..e59229a 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
@@ -15,6 +15,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;

 using OpenSim.world;

 using OpenSim.Assets;

+using OpenSim.Framework.Console;

 

 namespace OpenSim

 {

@@ -42,7 +43,7 @@ namespace OpenSim
                         ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);

                         string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();

 

-                        Console.WriteLine(reqUrl);

+                        MainConsole.Instance.Verbose("Requesting " + reqUrl);

 

                         SimParams = new Hashtable();

                         SimParams["session_id"] = this.SessionID.ToString();

@@ -72,7 +73,7 @@ namespace OpenSim
                     }

                     catch (Exception e)

                     {

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");

+                        MainConsole.Instance.Notice("Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");

                     }

                 }

                 Thread.Sleep(3000);

@@ -112,7 +113,7 @@ namespace OpenSim
                 neighboury += 1;

                 newpos.Y = 1;

             }

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]");

+            MainConsole.Instance.Notice("SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]");

 

             Hashtable SimParams;

             ArrayList SendParams;

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 7928817..f21efaf 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -15,6 +15,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;

 using OpenSim.world;

 using OpenSim.Assets;

+using OpenSim.Framework.Console;

 

 namespace OpenSim

 {

@@ -29,7 +30,7 @@ namespace OpenSim
 

         protected virtual bool Logout(ClientView simClient, Packet packet)

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request");

+            MainConsole.Instance.Notice("OpenSimClient.cs:ProcessInPacket() - Got a logout request");

             //send reply to let the client logout

             LogoutReplyPacket logReply = new LogoutReplyPacket();

             logReply.AgentData.AgentID = this.AgentID;

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index 19d222c..7cb2727 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -16,6 +16,7 @@ using OpenSim.Framework.Utilities;
 using OpenSim.world;

 using OpenSim.RegionServer.world;

 using OpenSim.Assets;

+using OpenSim.Framework.Console;

 

 namespace OpenSim

 {

@@ -464,7 +465,7 @@ namespace OpenSim
                         outgoing.MoneyData.TransactionSuccess = true;

                         outgoing.MoneyData.Description = libsecondlife.Helpers.StringToField("");

                         this.OutPacket((Packet)outgoing);

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sent Temporary Money packet (they have leet monies)");

+                        MainConsole.Instance.Notice("Sent Temporary Money packet (they have leet monies)");

 

                         break;

 

@@ -477,7 +478,7 @@ namespace OpenSim
                         estateCovenantReply.Data.CovenantID = LLUUID.Zero;

                         estateCovenantReply.Data.CovenantTimestamp = (uint)0;

                         this.OutPacket((Packet)estateCovenantReply);

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sent Temporary Estate packet (they are in leet estate)");

+                        MainConsole.Instance.Notice("Sent Temporary Estate packet (they are in leet estate)");

                         break;

                     #endregion

                 }

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index 8f7cf58..bf6b72e 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -41,6 +41,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Framework.Utilities;

 using OpenSim.world;

 using OpenSim.Assets;

+using OpenSim.Framework.Console;

 

 namespace OpenSim

 {

@@ -110,7 +111,7 @@ namespace OpenSim
             m_child = child;

             m_regionData = regionDat;

             m_authenticateSessionsHandler = authenSessions;

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");

+            MainConsole.Instance.Notice("OpenSimClient.cs - Started up new client thread to handle incoming request");

             cirpack = initialcirpack;

             userEP = remoteEP;

 

@@ -150,7 +151,7 @@ namespace OpenSim
         # region Client Methods

         public void UpgradeClient()

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent");

+            MainConsole.Instance.Notice("SimClient.cs:UpgradeClient() - upgrading child to full agent");

             this.m_child = false;

             //this.m_world.RemoveViewerAgent(this);

             if (!this.m_sandboxMode)

@@ -164,7 +165,7 @@ namespace OpenSim
 

         public void DowngradeClient()

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - changing full agent to child");

+            MainConsole.Instance.Notice("SimClient.cs:UpgradeClient() - changing full agent to child");

             this.m_child = true;

             OnChildAgentStatus(this.m_child);

             //this.m_world.RemoveViewerAgent(this);

@@ -254,7 +255,7 @@ namespace OpenSim
 

         protected virtual void ClientLoop()

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop");

+            MainConsole.Instance.Notice("OpenSimClient.cs:ClientLoop() - Entered loop");

             while (true)

             {

                 QueItem nextPacket = PacketQueue.Dequeue();

@@ -276,7 +277,7 @@ namespace OpenSim
 

         protected virtual void InitNewClient()

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");

+            MainConsole.Instance.Notice("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");

             this.ClientAvatar = m_world.AddViewerAgent(this);         

         }

 

@@ -287,12 +288,12 @@ namespace OpenSim
             if (!sessionInfo.Authorised)

             {

                 //session/circuit not authorised

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());

                 ClientThread.Abort();

             }

             else

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());

                 //session is authorised

                 this.AgentID = cirpack.CircuitCode.ID;

                 this.SessionID = cirpack.CircuitCode.SessionID;

@@ -396,7 +397,7 @@ namespace OpenSim
             if (this.m_userServer != null)

             {

                 // a user server is set so request the inventory from it

-                Console.WriteLine("getting inventory from user server");

+                MainConsole.Instance.Verbose("getting inventory from user server");

                 inventory = m_inventoryCache.FetchAgentsInventory(this.AgentID, m_userServer);

             }

             else

@@ -414,7 +415,7 @@ namespace OpenSim
         {

             if (!(packet.InventoryBlock.Type == 3 || packet.InventoryBlock.Type == 7))

             {

-                System.Console.WriteLine("Attempted to create " + Util.FieldToString(packet.InventoryBlock.Name) + " in inventory.  Unsupported type");

+                MainConsole.Instance.Warn("Attempted to create " + Util.FieldToString(packet.InventoryBlock.Name) + " in inventory.  Unsupported type");

                 return;

             }

 

diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
index 642251c..1eee329 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
@@ -10,6 +10,7 @@ using System.Threading;
 using System.Timers;

 using OpenSim.Framework.Utilities;

 using OpenSim.Framework.Interfaces;

+using OpenSim.Framework.Console;

 

 namespace OpenSim

 {

@@ -132,7 +133,7 @@ namespace OpenSim
             }

             catch (Exception)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");

+                MainConsole.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");

                 this.KillThread();

             }

 

@@ -227,7 +228,7 @@ namespace OpenSim
                 {

                     if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))

                     {

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " +

+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Resending " + packet.Type.ToString() + " packet, " +

                          (now - packet.TickCount) + "ms have passed");

 

                         packet.Header.Resent = true;

@@ -246,7 +247,7 @@ namespace OpenSim
                     if (PendingAcks.Count > 250)

                     {

                         // FIXME: Handle the odd case where we have too many pending ACKs queued up

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!");

+                        OpenSim.Framework.Console.MainConsole.Instance.Verbose("Too many ACKs queued up!");

                         return;

                     }

 

diff --git a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
index 003412d..59d3424 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
@@ -89,7 +89,7 @@ namespace OpenSim
             {

                 this.SetupFromConfigFile(this.localConfig);

             }

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

+            m_console.Notice("Main.cs:Startup() - Loading configuration");

             this.regionData.InitConfig(this.m_sandbox, this.localConfig);

             this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change

 

@@ -118,7 +118,7 @@ namespace OpenSim
             }

             catch (Exception e)

             {

-                m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup local cache");

+                m_console.Error(e.Message + "\nSorry, could not setup local cache");

                 Environment.Exit(1);

             }

 

@@ -141,7 +141,7 @@ namespace OpenSim
                 AssetCache.LoadDefaultTextureSet();

             }

 

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

+            m_console.Notice("Main.cs:Startup() - Initialising HTTP server");

 

             this.SetupHttpListener();

 

@@ -173,7 +173,7 @@ namespace OpenSim
             AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);

             adminWebFront.LoadMethods(httpServer);

 

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

+            m_console.Notice("Main.cs:Startup() - Starting HTTP server");

             httpServer.Start();

 

             //MainServerListener();

@@ -190,7 +190,7 @@ namespace OpenSim
             GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";

             GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";

 

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Starting in Sandbox mode");

+            m_console.Notice("Starting in Sandbox mode");

 

             try

             {

@@ -198,7 +198,7 @@ namespace OpenSim
             }

             catch (Exception e)

             {

-                m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup the grid interface");

+                m_console.Error(e.Message + "\nSorry, could not setup the grid interface");

                 Environment.Exit(1);

             }

         }

@@ -215,7 +215,7 @@ namespace OpenSim
             }

             GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";

 

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Starting in Grid mode");

+            m_console.Notice("Starting in Grid mode");

 

             try

             {

@@ -223,15 +223,15 @@ namespace OpenSim
             }

             catch (Exception e)

             {

-                m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup the grid interface");

+                m_console.Error(e.Message + "\nSorry, could not setup the grid interface");

                 Environment.Exit(1);

             }

         }

 

         protected virtual void SetupLocalWorld()

         {

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world");

+            m_console.Notice("Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());

+            m_console.Notice("Initialising world");

             m_console.componentname = "Region " + regionData.RegionName;

 

             m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);

@@ -249,7 +249,7 @@ namespace OpenSim
             LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.

             LocalWorld.LoadWorldMap();

 

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting up messaging system");

+            m_console.Notice("Main.cs:Startup() - Starting up messaging system");

             LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); 

             LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());

             LocalWorld.LoadPrimsFromStorage();

@@ -297,7 +297,7 @@ namespace OpenSim
         {

             if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort))

             {

-                m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Success: Got a grid connection OK!");

+                m_console.Notice("Main.cs:Startup() - Success: Got a grid connection OK!");

             }

             else

             {

@@ -397,7 +397,7 @@ namespace OpenSim
                 switch (attri)

                 {

                     default:

-                        m_console.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");

+                        m_console.Warn("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");

                         Environment.Exit(1);

                         break;

 

@@ -440,11 +440,11 @@ namespace OpenSim
         /// </summary>

         public virtual void Shutdown()

         {

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing all threads");

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing listener thread");

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing clients");

+            m_console.Notice("Main.cs:Shutdown() - Closing all threads");

+            m_console.Notice("Main.cs:Shutdown() - Killing listener thread");

+            m_console.Notice("Main.cs:Shutdown() - Killing clients");

             // IMPLEMENT THIS

-            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating");

+            m_console.Notice("Main.cs:Shutdown() - Closing console and terminating");

             LocalWorld.Close();

             GridServers.Close();

             m_console.Close();

@@ -472,8 +472,8 @@ namespace OpenSim
             switch (command)

             {

                 case "help":

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "show users - show info about connected users");

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - disconnect all clients and shutdown");

+                    m_console.Error("show users - show info about connected users");

+                    m_console.Error("shutdown - disconnect all clients and shutdown");

                     break;

 

                 case "show":

@@ -484,7 +484,7 @@ namespace OpenSim
                     string result = "";

                     if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))

                     {

-                        m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, result);

+                        m_console.Error(result);

                     }

                     break;

 

@@ -493,7 +493,7 @@ namespace OpenSim
                     break;

 

                 default:

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "Unknown command");

+                    m_console.Error("Unknown command");

                     break;

             }

         }

@@ -507,18 +507,18 @@ namespace OpenSim
             switch (ShowWhat)

             {

                 case "uptime":

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "OpenSim has been running since " + startuptime.ToString());

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString());

+                    m_console.Error("OpenSim has been running since " + startuptime.ToString());

+                    m_console.Error("That is " + (DateTime.Now - startuptime).ToString());

                     break;

                 case "users":

                     OpenSim.world.Avatar TempAv;

-                    m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));

+                    m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));

                     foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)

                     {

                         if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")

                         {

                             TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID];

-                            m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));

+                            m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));

                         }

                     }

                     break;

diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index 6bd8f08..0e75d8b 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -82,7 +82,7 @@ namespace OpenSim
             stIn.Close();

             gridresp.Close();

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse);

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse);

         }

 

         public void InitConfig(bool sandboxMode, IGenericConfig configData)

@@ -333,21 +333,21 @@ namespace OpenSim
             }

             catch (Exception e)

             {

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

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

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

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

             }

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Simulator Settings Loaded");

-            /* OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated());

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName);

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString());

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString());

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset URL: " + this.AssetURL);

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset key: " + this.AssetSendKey);

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid URL: " + this.GridURL);

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid key: " + this.GridSendKey); */

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Simulator Settings Loaded");

+            /* MainConsole.Instance.Notice("UUID: " + this.SimUUID.ToStringHyphenated());

+            MainConsole.Instance.Notice("Name: " + this.RegionName);

+            MainConsole.Instance.Notice("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");

+            MainConsole.Instance.Notice("Region Handle: " + this.RegionHandle.ToString());

+            MainConsole.Instance.Notice("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);

+            MainConsole.Instance.Notice("Sandbox Mode? " + isSandbox.ToString());

+            MainConsole.Instance.Notice("Asset URL: " + this.AssetURL);

+            MainConsole.Instance.Notice("Asset key: " + this.AssetSendKey);

+            MainConsole.Instance.Notice("Grid URL: " + this.GridURL);

+            MainConsole.Instance.Notice("Grid key: " + this.GridSendKey); */

         }

     }

 }

diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 3a93e66..ac65a93 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -144,20 +144,20 @@ namespace OpenSim
 

         public void ServerListener()

         {

-            m_console.WriteLine("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);

+            m_console.Notice("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);

 

             ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);

             Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);

             Server.Bind(ServerIncoming);

  

-            m_console.WriteLine("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");

+            m_console.Notice("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");

 

             ipeSender = new IPEndPoint(IPAddress.Any, 0);

             epSender = (EndPoint)ipeSender;

             ReceivedData = new AsyncCallback(this.OnReceivedData);

             Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

 

-            m_console.WriteLine("UDPServer.cs:ServerListener() - Listening...");

+            m_console.Notice("UDPServer.cs:ServerListener() - Listening...");

 

         }

 

diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.cs
index f9f3cc4..f7a5766 100644
--- a/OpenSim/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim/OpenSim.RegionServer/world/Avatar.cs
@@ -46,7 +46,7 @@ namespace OpenSim.world
             m_regionTerraform = regionTerraform;

             m_regionWaterHeight = regionWater;

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs - Loading details from grid (DUMMY)");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs - Loading details from grid (DUMMY)");

             ControllingClient = TheClient;

             localid = 8880000 + (this.m_world._localNumber++);

             Pos = ControllingClient.startpos;

@@ -211,7 +211,7 @@ namespace OpenSim.world
 

         public void CompleteMovement()

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet");

             AgentMovementCompletePacket mov = new AgentMovementCompletePacket();

             mov.AgentData.SessionID = this.ControllingClient.SessionID;

             mov.AgentData.AgentID = this.ControllingClient.AgentID;

@@ -382,11 +382,11 @@ namespace OpenSim.world
         //really really should be moved somewhere else (RegionInfo.cs ?)

         public void SendRegionHandshake(World regionInfo)

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");

             System.Text.Encoding _enc = System.Text.Encoding.ASCII;

             RegionHandshakePacket handshake = new RegionHandshakePacket();

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");

             handshake.RegionInfo.BillableFactor = 0;

             handshake.RegionInfo.IsEstateManager = false;

             handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.TerrainHeightRange00;

@@ -417,7 +417,7 @@ namespace OpenSim.world
             handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.TerrainDetail3;

             handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet");

             this.ControllingClient.OutPacket(handshake);

         }

 

diff --git a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
index 9e96a4e..2947b96 100644
--- a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
@@ -18,7 +18,7 @@ namespace OpenSim.world
 

         public void LoadAnims()

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs:LoadAnims() - Loading avatar animations");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");

             XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");

            

             XmlDocument doc = new XmlDocument();

@@ -35,7 +35,7 @@ namespace OpenSim.world
 

             reader.Close();

 

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");

+            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");

 

             foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID)

             {

diff --git a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
index 8924773..6bf1598 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
@@ -113,7 +113,7 @@ namespace OpenSim.world
                             //Uncomment when prim/object UUIDs are random or such

                             //2007-03-22 - Randomskk

                             //this._primCount--;

-                            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Deleted UUID " + ent.uuid);

+                            OpenSim.Framework.Console.MainConsole.Instance.Verbose("Deleted UUID " + ent.uuid);

                         }

                     }

                 }

diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
index 92de6f0..1f15e9c 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.cs
@@ -15,6 +15,7 @@ using OpenSim.Assets;
 //using OpenSim.world.scripting;

 using OpenSim.RegionServer.world.scripting;

 using OpenSim.Terrain;

+using OpenSim.Framework.Console;

 

 namespace OpenSim.world

 {

@@ -71,12 +72,12 @@ namespace OpenSim.world
                 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();

                 m_scripts = new Dictionary<string, ScriptFactory>();

 

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance");

+                MainConsole.Instance.Notice("World.cs - creating new entitities instance");

                 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();

                 Avatars = new Dictionary<LLUUID, Avatar>();

                 Prims = new Dictionary<LLUUID, Primitive>();

 

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap");

+                MainConsole.Instance.Notice("World.cs - creating LandMap");

                 TerrainManager = new TerrainManager(new SecondLife());

                 Terrain = new TerrainEngine();

                 Avatar.SetupTemplate("avatar-texture.dat");

@@ -90,7 +91,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Constructor failed with exception " + e.ToString());

             }

         }

         #endregion

@@ -110,7 +111,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddScript() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: AddScript() - Failed with exception " + e.ToString());

             }

         }

 

@@ -162,7 +163,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddScript() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: AddScript() - Failed with exception " + e.ToString());

             }

         }

 

@@ -216,7 +217,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());

             }

             updateLock.ReleaseMutex();

         }

@@ -229,15 +230,15 @@ namespace OpenSim.world
                 if (Terrain.tainted > 0)

                 {

                     Terrain.tainted = 0;

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");

+                    MainConsole.Instance.Notice("World.cs: Backup() - Terrain tainted, saving.");

                     localStorage.SaveMap(Terrain.getHeights1D());

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Rebuilding world map image.");

+                    MainConsole.Instance.Notice("World.cs: Backup() - Rebuilding world map image.");

                     Terrain.exportImage("map_" + m_regInfo.RegionName.ToLower() + ".png", "defaultstripe.png");

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");

+                    MainConsole.Instance.Notice("World.cs: Backup() - Terrain saved, informing Physics.");

                     phyScene.SetTerrain(Terrain.getHeights1D());

 

                     // Needs optimising to just send patches which have changed.

-                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain changed, informing Clients.");

+                    MainConsole.Instance.Notice("World.cs: Backup() - Terrain changed, informing Clients.");

                     foreach (ClientView client in m_clientThreads.Values)

                     {

                         this.SendLayerData(client);

@@ -245,7 +246,7 @@ namespace OpenSim.world
                 }

 

                 // Primitive backup routines -- should only do if there's been a change.

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives");

+                MainConsole.Instance.Notice("World.cs: Backup() - Backing up Primitives");

                 foreach (libsecondlife.LLUUID UUID in Entities.Keys)

                 {

                     Entities[UUID].BackUp();

@@ -268,7 +269,7 @@ namespace OpenSim.world
             catch (Exception e)

             {

                 // Backup failed

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Backup() - Backup Failed with exception " + e.ToString());

                 return false;

             }

         }

@@ -314,7 +315,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());

                 return false;

             }

         }

@@ -358,7 +359,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

             }

         }

 

@@ -389,7 +390,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

             }

         }

 

@@ -415,7 +416,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());

             }

         }

 

@@ -461,7 +462,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());

             }

         }

         #endregion

@@ -487,7 +488,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: GetInitialPrims() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: GetInitialPrims() - Failed with exception " + e.ToString());

             }

         }

 

@@ -498,12 +499,12 @@ namespace OpenSim.world
         {

             try

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives");

+                MainConsole.Instance.Notice("World.cs: LoadPrimsFromStorage() - Loading primitives");

                 this.localStorage.LoadPrimitives(this);

             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());

             }

         }

 

@@ -519,14 +520,14 @@ namespace OpenSim.world
                 {

                     _primCount = prim.LocalID + 1;

                 }

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage");

+                MainConsole.Instance.Notice("World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage");

                 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);

                 nPrim.CreateFromStorage(prim);

                 this.Entities.Add(nPrim.uuid, nPrim);

             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: PrimFromStorage() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: PrimFromStorage() - Failed with exception " + e.ToString());

             }

         }

 

@@ -539,7 +540,7 @@ namespace OpenSim.world
         {

             try

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: AddNewPrim() - Creating new prim");

+                MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");

                 Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);

                 prim.CreateFromPacket(addPacket, ownerID, this._primCount);

                 PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z);

@@ -557,7 +558,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddNewPrim() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());

             }

         }

 

@@ -590,10 +591,10 @@ namespace OpenSim.world
             Avatar newAvatar = null;

             try

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

+                MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

                 newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20);

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");

+                MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Adding new avatar to world");

+                MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Starting RegionHandshake ");

                 newAvatar.SendRegionHandshake(this);

                 //if (!agentClient.m_child)

                 //{

@@ -629,7 +630,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());

             }

             return newAvatar;

         }

@@ -655,7 +656,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString());

             }

         }

         #endregion

@@ -689,7 +690,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());

+                OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Close() - Failed with exception " + e.ToString());

             }

         }

         #endregion

diff --git a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
index f8fb49d..2d4b6bf 100644
--- a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
+++ b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
@@ -14,6 +14,7 @@ using OpenSim.Framework.Inventory;
 using OpenSim.Assets;

 using OpenSim.RegionServer.world.scripting;

 using OpenSim.Terrain;

+using OpenSim.Framework.Console;

 

 namespace OpenSim.world

 {

@@ -112,7 +113,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: SendLayerData() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: SendLayerData() - Failed with exception " + e.ToString());

             }

         }

 

@@ -138,7 +139,7 @@ namespace OpenSim.world
             }

             catch (Exception e)

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: SendLayerData() - Failed with exception " + e.ToString());

+                MainConsole.Instance.Warn("World.cs: SendLayerData() - Failed with exception " + e.ToString());

             }

         }

         #endregion