Massive console refactor. Greatly simplify interface.

1 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index b90b75f..16b4636 100644..100755
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -188,13 +188,19 @@ namespace OpenSim.Framework.Console
             m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand);
         }
 
-        public override void Output(string text, string level)
+        public override void Output(string format, string level = null, params object[] components)
         {
-            Output(text, level, false, false, false);
+            if (components.Length == 0)
+                Output(format, level, false, false, false);
+            else
+                Output(String.Format(format, components), level, false, false, false);
         }
 
         protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput)
         {
+            if (level == null)
+                level = String.Empty;
+
             // Increment the line number. It was 0 and they start at 1
             // so we need to pre-increment.
             m_lineNumber++;
@@ -228,12 +234,6 @@ namespace OpenSim.Framework.Console
             System.Console.WriteLine(text.Trim());
         }
 
-        public override void Output(string text)
-        {
-            // Output plain (non-logging style) text.
-            Output(text, String.Empty, false, false, false);
-        }
-
         public override string ReadLine(string p, bool isCommand, bool e)
         {
             // Output the prompt an prepare to wait. This