diff options
author | UbitUmarov | 2019-09-21 16:35:38 +0100 |
---|---|---|
committer | UbitUmarov | 2019-09-21 16:35:38 +0100 |
commit | b046ccebf27b653fb5b02256ffd5e55e5a685482 (patch) | |
tree | eadf90ca4f83cabb65713c9a08b93f409079022a | |
parent | add a missing return (diff) | |
download | opensim-SC-b046ccebf27b653fb5b02256ffd5e55e5a685482.zip opensim-SC-b046ccebf27b653fb5b02256ffd5e55e5a685482.tar.gz opensim-SC-b046ccebf27b653fb5b02256ffd5e55e5a685482.tar.bz2 opensim-SC-b046ccebf27b653fb5b02256ffd5e55e5a685482.tar.xz |
make Console Output(..) compatible with rest of code, again
-rwxr-xr-x | OpenSim/Framework/Console/ConsoleBase.cs | 7 | ||||
-rwxr-xr-x | OpenSim/Framework/Console/LocalConsole.cs | 3 | ||||
-rwxr-xr-x | 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 56bda05..b011719 100755 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
@@ -58,7 +58,12 @@ namespace OpenSim.Framework.Console | |||
58 | { | 58 | { |
59 | } | 59 | } |
60 | 60 | ||
61 | public virtual void Output(string format, string level = null, params object[] components) | 61 | public void Output(string format, params object[] components) |
62 | { | ||
63 | Output(format, null, components); | ||
64 | } | ||
65 | |||
66 | public virtual void Output(string format, string level, params object[] components) | ||
62 | { | 67 | { |
63 | System.Console.WriteLine(format, components); | 68 | System.Console.WriteLine(format, components); |
64 | } | 69 | } |
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index f2d2fa3..d19e244 100755 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs | |||
@@ -389,7 +389,7 @@ namespace OpenSim.Framework.Console | |||
389 | System.Console.WriteLine(); | 389 | System.Console.WriteLine(); |
390 | } | 390 | } |
391 | 391 | ||
392 | public override void Output(string format, string level = null, params object[] components) | 392 | public override void Output(string format, string level, params object[] components) |
393 | { | 393 | { |
394 | string text = String.Format(format, components); | 394 | string text = String.Format(format, components); |
395 | 395 | ||
@@ -400,7 +400,6 @@ namespace OpenSim.Framework.Console | |||
400 | if (m_cursorYPosition == -1) | 400 | if (m_cursorYPosition == -1) |
401 | { | 401 | { |
402 | WriteLocalText(text, level); | 402 | WriteLocalText(text, level); |
403 | |||
404 | return; | 403 | return; |
405 | } | 404 | } |
406 | 405 | ||
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs index 6adc678..e5db271 100755 --- a/OpenSim/Framework/Console/MockConsole.cs +++ b/OpenSim/Framework/Console/MockConsole.cs | |||
@@ -62,7 +62,8 @@ namespace OpenSim.Framework.Console | |||
62 | set {} | 62 | set {} |
63 | } | 63 | } |
64 | 64 | ||
65 | public void Output(string format, string level, params object[] components) {} | 65 | public void Output(string format, params object[] components) { } |
66 | public void Output(string format, string level, params object[] components) { } | ||
66 | 67 | ||
67 | public string Prompt(string p) { return ""; } | 68 | public string Prompt(string p) { return ""; } |
68 | public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; } | 69 | public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; } |