From 43b56eaf08457ffce3aa5f73321bb18dda9ae1db Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sat, 21 Sep 2019 16:59:41 +0100 Subject: [PATCH] make Console Promt(..) compatible with rest of code, again --- OpenSim/Framework/Console/ConsoleBase.cs | 17 ++++++++++++++++- OpenSim/Framework/Console/MockConsole.cs | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index b011719fc1..343958b1bc 100755 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs @@ -68,7 +68,22 @@ namespace OpenSim.Framework.Console System.Console.WriteLine(format, components); } - public virtual string Prompt(string p, string def = null, List excludedCharacters = null, bool echo = true) + public string Prompt(string p) + { + return Prompt(p, null, null, true); + } + + public string Prompt(string p, string def) + { + return Prompt(p, def, null, true); + } + + public string Prompt(string p, List excludedCharacters) + { + return Prompt(p, null, excludedCharacters, true); + } + + public virtual string Prompt(string p, string def, List excludedCharacters, bool echo = true) { bool itisdone = false; string ret = String.Empty; diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs index e5db271978..291b7e9fd4 100755 --- a/OpenSim/Framework/Console/MockConsole.cs +++ b/OpenSim/Framework/Console/MockConsole.cs @@ -66,6 +66,8 @@ namespace OpenSim.Framework.Console public void Output(string format, string level, params object[] components) { } public string Prompt(string p) { return ""; } + public string Prompt(string p, string def) { return ""; } + public string Prompt(string p, List excludedCharacters) { return ""; } public string Prompt(string p, string def, List excludedCharacters, bool echo) { return ""; } public string Prompt(string prompt, string defaultresponse, List options) { return ""; }