diff options
author | Melanie | 2019-08-25 23:05:57 +0100 |
---|---|---|
committer | Melanie | 2019-08-25 23:07:14 +0100 |
commit | 584df2ab38c35b31e1a279f1992f7032d256ceb5 (patch) | |
tree | a15ea207bbb250f909694963fdde6a6f79ff2af4 /OpenSim | |
parent | revert last change and o fix the damm silly bug (diff) | |
download | opensim-SC-584df2ab38c35b31e1a279f1992f7032d256ceb5.zip opensim-SC-584df2ab38c35b31e1a279f1992f7032d256ceb5.tar.gz opensim-SC-584df2ab38c35b31e1a279f1992f7032d256ceb5.tar.bz2 opensim-SC-584df2ab38c35b31e1a279f1992f7032d256ceb5.tar.xz |
Fix console outputting raw format strings
Diffstat (limited to 'OpenSim')
-rwxr-xr-x | OpenSim/Framework/Console/LocalConsole.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index 55c5c7e..f2d2fa3 100755 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs | |||
@@ -391,13 +391,15 @@ namespace OpenSim.Framework.Console | |||
391 | 391 | ||
392 | public override void Output(string format, string level = null, params object[] components) | 392 | public override void Output(string format, string level = null, params object[] components) |
393 | { | 393 | { |
394 | FireOnOutput(format); | 394 | string text = String.Format(format, components); |
395 | |||
396 | FireOnOutput(text); | ||
395 | 397 | ||
396 | lock (m_commandLine) | 398 | lock (m_commandLine) |
397 | { | 399 | { |
398 | if (m_cursorYPosition == -1) | 400 | if (m_cursorYPosition == -1) |
399 | { | 401 | { |
400 | WriteLocalText(format, level); | 402 | WriteLocalText(text, level); |
401 | 403 | ||
402 | return; | 404 | return; |
403 | } | 405 | } |
@@ -413,7 +415,7 @@ namespace OpenSim.Framework.Console | |||
413 | m_cursorYPosition = SetCursorTop(m_cursorYPosition); | 415 | m_cursorYPosition = SetCursorTop(m_cursorYPosition); |
414 | SetCursorLeft(0); | 416 | SetCursorLeft(0); |
415 | 417 | ||
416 | WriteLocalText(format, level); | 418 | WriteLocalText(text, level); |
417 | 419 | ||
418 | m_cursorYPosition = System.Console.CursorTop; | 420 | m_cursorYPosition = System.Console.CursorTop; |
419 | 421 | ||