aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2019-09-21 16:59:41 +0100
committerUbitUmarov2019-09-21 16:59:41 +0100
commit43b56eaf08457ffce3aa5f73321bb18dda9ae1db (patch)
tree79761d1074bad3fca5a3206823a499a27a999987 /OpenSim
parentmake Console Output(..) compatible with rest of code, again (diff)
downloadopensim-SC-43b56eaf08457ffce3aa5f73321bb18dda9ae1db.zip
opensim-SC-43b56eaf08457ffce3aa5f73321bb18dda9ae1db.tar.gz
opensim-SC-43b56eaf08457ffce3aa5f73321bb18dda9ae1db.tar.bz2
opensim-SC-43b56eaf08457ffce3aa5f73321bb18dda9ae1db.tar.xz
make Console Promt(..) compatible with rest of code, again
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Framework/Console/ConsoleBase.cs17
-rwxr-xr-xOpenSim/Framework/Console/MockConsole.cs2
2 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index b011719..343958b 100755
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -68,7 +68,22 @@ namespace OpenSim.Framework.Console
68 System.Console.WriteLine(format, components); 68 System.Console.WriteLine(format, components);
69 } 69 }
70 70
71 public virtual string Prompt(string p, string def = null, List<char> excludedCharacters = null, bool echo = true) 71 public string Prompt(string p)
72 {
73 return Prompt(p, null, null, true);
74 }
75
76 public string Prompt(string p, string def)
77 {
78 return Prompt(p, def, null, true);
79 }
80
81 public string Prompt(string p, List<char> excludedCharacters)
82 {
83 return Prompt(p, null, excludedCharacters, true);
84 }
85
86 public virtual string Prompt(string p, string def, List<char> excludedCharacters, bool echo = true)
72 { 87 {
73 bool itisdone = false; 88 bool itisdone = false;
74 string ret = String.Empty; 89 string ret = String.Empty;
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
index e5db271..291b7e9 100755
--- a/OpenSim/Framework/Console/MockConsole.cs
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -66,6 +66,8 @@ namespace OpenSim.Framework.Console
66 public void Output(string format, string level, params object[] components) { } 66 public void Output(string format, string level, params object[] components) { }
67 67
68 public string Prompt(string p) { return ""; } 68 public string Prompt(string p) { return ""; }
69 public string Prompt(string p, string def) { return ""; }
70 public string Prompt(string p, List<char> excludedCharacters) { return ""; }
69 public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; } 71 public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; }
70 72
71 public string Prompt(string prompt, string defaultresponse, List<string> options) { return ""; } 73 public string Prompt(string prompt, string defaultresponse, List<string> options) { return ""; }