From 211ea5d52126bf19d53e57af750a0a964a60b56e Mon Sep 17 00:00:00 2001
From: Marck
Date: Sun, 19 Sep 2010 13:26:06 +0200
Subject: Limit formatting of local console output to actual logging messages.
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
---
OpenSim/Framework/Console/LocalConsole.cs | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 6043094..5f2f404 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -44,6 +44,7 @@ namespace OpenSim.Framework.Console
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private readonly object m_syncRoot = new object();
+ private const string LOGLEVEL_NONE = "(none)";
private int y = -1;
private int cp = 0;
@@ -278,22 +279,25 @@ namespace OpenSim.Framework.Console
private void WriteLocalText(string text, string level)
{
- string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
-
- Regex RE = new Regex(regex, RegexOptions.Multiline);
- MatchCollection matches = RE.Matches(text);
-
string outText = text;
- if (matches.Count == 1)
+ if (level != LOGLEVEL_NONE)
{
- outText = matches[0].Groups["End"].Value;
- System.Console.Write(matches[0].Groups["Front"].Value);
+ string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
+
+ Regex RE = new Regex(regex, RegexOptions.Multiline);
+ MatchCollection matches = RE.Matches(text);
- System.Console.Write("[");
- WriteColorText(DeriveColor(matches[0].Groups["Category"].Value),
- matches[0].Groups["Category"].Value);
- System.Console.Write("]:");
+ if (matches.Count == 1)
+ {
+ outText = matches[0].Groups["End"].Value;
+ System.Console.Write(matches[0].Groups["Front"].Value);
+
+ System.Console.Write("[");
+ WriteColorText(DeriveColor(matches[0].Groups["Category"].Value),
+ matches[0].Groups["Category"].Value);
+ System.Console.Write("]:");
+ }
}
if (level == "error")
@@ -308,7 +312,7 @@ namespace OpenSim.Framework.Console
public override void Output(string text)
{
- Output(text, "normal");
+ Output(text, LOGLEVEL_NONE);
}
public override void Output(string text, string level)
--
cgit v1.1
From ed161020e2da611e56c63ea8314e5305845f3377 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 9 Oct 2010 01:46:29 +0100
Subject: minor: remove some mono compiler warnings
---
OpenSim/Framework/Tests/MundaneFrameworkTests.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index 04be083..e7f8bfc 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -140,10 +140,10 @@ namespace OpenSim.Framework.Tests
settings.Save();
settings.OnSave -= RegionSaveFired;
- string str = settings.LoadedCreationDate;
- int dt = settings.LoadedCreationDateTime;
- string id = settings.LoadedCreationID;
- string time = settings.LoadedCreationTime;
+// string str = settings.LoadedCreationDate;
+// int dt = settings.LoadedCreationDateTime;
+// string id = settings.LoadedCreationID;
+// string time = settings.LoadedCreationTime;
Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire");
--
cgit v1.1