OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make Console Output(..) compatible with rest of code, again

0.9.1.0-post-fixes
UbitUmarov 2019-09-21 16:35:38 +01:00
parent d7bf623f57
commit b046ccebf2
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/Console/ConsoleBase.cs
View File

@ -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); System.Console.WriteLine(format, components);
} }

3
OpenSim/Framework/Console/LocalConsole.cs
View File

@ -389,7 +389,7 @@ namespace OpenSim.Framework.Console
System.Console.WriteLine(); 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); string text = String.Format(format, components);
@ -400,7 +400,6 @@ namespace OpenSim.Framework.Console
if (m_cursorYPosition == -1) if (m_cursorYPosition == -1)
{ {
WriteLocalText(text, level); WriteLocalText(text, level);
return; return;
} }

3
OpenSim/Framework/Console/MockConsole.cs
View File

@ -62,7 +62,8 @@ namespace OpenSim.Framework.Console
set {} 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) { return ""; }
public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; } public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; }