diff options
author | Melanie | 2019-08-20 23:28:59 +0100 |
---|---|---|
committer | Melanie | 2019-08-20 23:28:59 +0100 |
commit | 0fd17c08ae642fac17b24dfad06c61cfe5739483 (patch) | |
tree | 4871c96eab2f5b118cb09d670a3a4ba024cf1210 /OpenSim/Framework/Console/RemoteConsole.cs | |
parent | change PGSQL migration (diff) | |
download | opensim-SC-0fd17c08ae642fac17b24dfad06c61cfe5739483.zip opensim-SC-0fd17c08ae642fac17b24dfad06c61cfe5739483.tar.gz opensim-SC-0fd17c08ae642fac17b24dfad06c61cfe5739483.tar.bz2 opensim-SC-0fd17c08ae642fac17b24dfad06c61cfe5739483.tar.xz |
Massive console refactor. Greatly simplify interface.
Diffstat (limited to '')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Framework/Console/RemoteConsole.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index b90b75f..16b4636 100644..100755 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
@@ -188,13 +188,19 @@ namespace OpenSim.Framework.Console | |||
188 | m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand); | 188 | m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand); |
189 | } | 189 | } |
190 | 190 | ||
191 | public override void Output(string text, string level) | 191 | public override void Output(string format, string level = null, params object[] components) |
192 | { | 192 | { |
193 | Output(text, level, false, false, false); | 193 | if (components.Length == 0) |
194 | Output(format, level, false, false, false); | ||
195 | else | ||
196 | Output(String.Format(format, components), level, false, false, false); | ||
194 | } | 197 | } |
195 | 198 | ||
196 | protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput) | 199 | protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput) |
197 | { | 200 | { |
201 | if (level == null) | ||
202 | level = String.Empty; | ||
203 | |||
198 | // Increment the line number. It was 0 and they start at 1 | 204 | // Increment the line number. It was 0 and they start at 1 |
199 | // so we need to pre-increment. | 205 | // so we need to pre-increment. |
200 | m_lineNumber++; | 206 | m_lineNumber++; |
@@ -228,12 +234,6 @@ namespace OpenSim.Framework.Console | |||
228 | System.Console.WriteLine(text.Trim()); | 234 | System.Console.WriteLine(text.Trim()); |
229 | } | 235 | } |
230 | 236 | ||
231 | public override void Output(string text) | ||
232 | { | ||
233 | // Output plain (non-logging style) text. | ||
234 | Output(text, String.Empty, false, false, false); | ||
235 | } | ||
236 | |||
237 | public override string ReadLine(string p, bool isCommand, bool e) | 237 | public override string ReadLine(string p, bool isCommand, bool e) |
238 | { | 238 | { |
239 | // Output the prompt an prepare to wait. This | 239 | // Output the prompt an prepare to wait. This |