From b046ccebf27b653fb5b02256ffd5e55e5a685482 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 21 Sep 2019 16:35:38 +0100 Subject: [PATCH] make Console Output(..) compatible with rest of code, again --- OpenSim/Framework/Console/ConsoleBase.cs | 7 ++++++- OpenSim/Framework/Console/LocalConsole.cs | 3 +-- OpenSim/Framework/Console/MockConsole.cs | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index 56bda057e0..b011719fc1 100755 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs @@ -58,7 +58,12 @@ namespace OpenSim.Framework.Console { } - public virtual void Output(string format, string level = null, params object[] components) + public void Output(string format, params object[] components) + { + Output(format, null, components); + } + + public virtual void Output(string format, string level, params object[] components) { System.Console.WriteLine(format, components); } diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index f2d2fa3415..d19e244051 100755 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs @@ -389,7 +389,7 @@ namespace OpenSim.Framework.Console System.Console.WriteLine(); } - public override void Output(string format, string level = null, params object[] components) + public override void Output(string format, string level, params object[] components) { string text = String.Format(format, components); @@ -400,7 +400,6 @@ namespace OpenSim.Framework.Console if (m_cursorYPosition == -1) { WriteLocalText(text, level); - return; } diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs index 6adc678d27..e5db271978 100755 --- a/OpenSim/Framework/Console/MockConsole.cs +++ b/OpenSim/Framework/Console/MockConsole.cs @@ -62,7 +62,8 @@ namespace OpenSim.Framework.Console set {} } - public void Output(string format, string level, params object[] components) {} + public void Output(string format, params object[] components) { } + public void Output(string format, string level, params object[] components) { } public string Prompt(string p) { return ""; } public string Prompt(string p, string def, List excludedCharacters, bool echo) { return ""; }