* 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.

3 files changed, 6 insertions, 9 deletions

diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
index 38f4370..3f9109d 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common/OpenSim.Servers/BaseHttpServer.cs
@@ -223,7 +223,7 @@ namespace OpenSim.Servers
 

         public void Start()

         {

-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");

+            MainConsole.Instance.Verbose("BaseHttpServer.cs: Starting up HTTP Server");

 

             m_workerThread = new Thread(new ThreadStart(StartHTTP));

             m_workerThread.IsBackground = true;

@@ -234,7 +234,7 @@ namespace OpenSim.Servers
         {

             try

             {

-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");

+                MainConsole.Instance.Verbose("BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");

                 m_httpListener = new HttpListener();

 

                 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");

@@ -249,7 +249,7 @@ namespace OpenSim.Servers
             }

             catch (Exception e)

             {

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

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

             }

         }

     }

diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/Common/OpenSim.Servers/CheckSumServer.cs
index 1125baf..280eb82 100644
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ b/Common/OpenSim.Servers/CheckSumServer.cs
@@ -100,8 +100,7 @@ namespace OpenSim.Servers
             }

             catch (Exception)

             {

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

-

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

             }

         }

 

diff --git a/Common/OpenSim.Servers/LoginResponse.cs b/Common/OpenSim.Servers/LoginResponse.cs
index 7333d1f..e78def4 100644
--- a/Common/OpenSim.Servers/LoginResponse.cs
+++ b/Common/OpenSim.Servers/LoginResponse.cs
@@ -210,8 +210,7 @@ namespace OpenSim.UserServer
             }

             catch (Exception e)

             {

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

-                    OpenSim.Framework.Console.LogPriority.LOW, 

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

                     "LoginResponse: Unable to set default values: " + e.Message

                 );

             }

@@ -326,8 +325,7 @@ namespace OpenSim.UserServer
             }

             catch (Exception e)

             {

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

-                    OpenSim.Framework.Console.LogPriority.LOW,

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

                     "LoginResponse: Error creating XML-RPC Response: " + e.Message

                 );

                 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));