diff options
Diffstat (limited to 'OpenSim/Framework/Console/LocalConsole.cs')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Framework/Console/LocalConsole.cs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index ba32f50..55c5c7e 100644..100755 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs | |||
@@ -359,7 +359,7 @@ namespace OpenSim.Framework.Console | |||
359 | { | 359 | { |
360 | string outText = text; | 360 | string outText = text; |
361 | 361 | ||
362 | if (level != LOGLEVEL_NONE) | 362 | if (level != null) |
363 | { | 363 | { |
364 | MatchCollection matches = m_categoryRegex.Matches(text); | 364 | MatchCollection matches = m_categoryRegex.Matches(text); |
365 | 365 | ||
@@ -389,20 +389,15 @@ namespace OpenSim.Framework.Console | |||
389 | System.Console.WriteLine(); | 389 | System.Console.WriteLine(); |
390 | } | 390 | } |
391 | 391 | ||
392 | public override void Output(string text) | 392 | public override void Output(string format, string level = null, params object[] components) |
393 | { | 393 | { |
394 | Output(text, LOGLEVEL_NONE); | 394 | FireOnOutput(format); |
395 | } | ||
396 | |||
397 | public override void Output(string text, string level) | ||
398 | { | ||
399 | FireOnOutput(text); | ||
400 | 395 | ||
401 | lock (m_commandLine) | 396 | lock (m_commandLine) |
402 | { | 397 | { |
403 | if (m_cursorYPosition == -1) | 398 | if (m_cursorYPosition == -1) |
404 | { | 399 | { |
405 | WriteLocalText(text, level); | 400 | WriteLocalText(format, level); |
406 | 401 | ||
407 | return; | 402 | return; |
408 | } | 403 | } |
@@ -418,7 +413,7 @@ namespace OpenSim.Framework.Console | |||
418 | m_cursorYPosition = SetCursorTop(m_cursorYPosition); | 413 | m_cursorYPosition = SetCursorTop(m_cursorYPosition); |
419 | SetCursorLeft(0); | 414 | SetCursorLeft(0); |
420 | 415 | ||
421 | WriteLocalText(text, level); | 416 | WriteLocalText(format, level); |
422 | 417 | ||
423 | m_cursorYPosition = System.Console.CursorTop; | 418 | m_cursorYPosition = System.Console.CursorTop; |
424 | 419 | ||