aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Console/LocalConsole.cs
diff options
context:
space:
mode:
authorUbitUmarov2019-10-22 11:55:27 +0100
committerUbitUmarov2019-10-22 11:55:27 +0100
commit7939974d921064d4316b5143e3eb45d3e99abf33 (patch)
tree548394800d2538bb4ddeb26c45fcd16751b53143 /OpenSim/Framework/Console/LocalConsole.cs
parenta few changes on osslEnable.ini (diff)
downloadopensim-SC-7939974d921064d4316b5143e3eb45d3e99abf33.zip
opensim-SC-7939974d921064d4316b5143e3eb45d3e99abf33.tar.gz
opensim-SC-7939974d921064d4316b5143e3eb45d3e99abf33.tar.bz2
opensim-SC-7939974d921064d4316b5143e3eb45d3e99abf33.tar.xz
try to fix console AGAIN
Diffstat (limited to 'OpenSim/Framework/Console/LocalConsole.cs')
-rwxr-xr-xOpenSim/Framework/Console/LocalConsole.cs27
1 files changed, 25 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index d19e244..e1492b8 100755
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -389,9 +389,32 @@ namespace OpenSim.Framework.Console
389 System.Console.WriteLine(); 389 System.Console.WriteLine();
390 } 390 }
391 391
392 public override void Output(string format, string level, params object[] components) 392 public override void Output(string format, params object[] components)
393 { 393 {
394 string text = String.Format(format, components); 394 string level = null;
395 if(components != null && components.Length > 0)
396 {
397 if(components[0] == null || components[0] is ConsoleLevel)
398 {
399 if(components[0] is ConsoleLevel)
400 level = ((ConsoleLevel)components[0]).ToString();
401
402 if (components.Length > 1)
403 {
404 object[] tmp = new object[components.Length - 1];
405 Array.Copy(components, 1, tmp, 0, components.Length - 1);
406 components = tmp;
407 }
408 else
409 components = null;
410 }
411
412 }
413 string text;
414 if (components == null || components.Length == 0)
415 text = format;
416 else
417 text = String.Format(format, components);
395 418
396 FireOnOutput(text); 419 FireOnOutput(text);
397 420