2 files changed, 71 insertions, 2 deletions

diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
new file mode 100644
index 0000000..58d27d0
--- /dev/null
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Globalization;
+
+using log4net.Core;
+using log4net.Layout;
+using log4net.Appender;
+using log4net.Util;
+
+namespace OpenSim.Framework.Console
+{
+    public class OpenSimAppender : AnsiColorTerminalAppender
+    {
+        override protected void Append(LoggingEvent le)
+        {
+            string loggingMessage = RenderLoggingEvent(le);
+            string regex = @"^(?<Front>.*)\[(?<Category>\w+)\](?<End>.*)";
+
+            Regex RE = new Regex(regex, RegexOptions.Multiline);
+            MatchCollection matches = RE.Matches(loggingMessage);
+            // Get some direct matches $1 $4 is a 
+            if (matches.Count == 1)
+            {
+                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("]");
+                System.Console.Write(matches[0].Groups["End"].Value);
+            } 
+            else
+            {
+                System.Console.WriteLine(loggingMessage);
+            }
+        }
+
+        private void WriteColorText(ConsoleColor color, string sender)
+        {
+            try
+            {
+                lock (this)
+                {
+                    try
+                    {
+                        System.Console.ForegroundColor = color;
+                        System.Console.Write(sender);
+                        System.Console.ResetColor();
+                    }
+                    catch (ArgumentNullException)
+                    {
+                        // Some older systems dont support coloured text.
+                        System.Console.WriteLine(sender);
+                    }
+                }
+            }
+            catch (ObjectDisposedException)
+            {
+            }
+        }
+
+        private ConsoleColor DeriveColor(string input)
+        {
+            int colIdx = (input.ToUpper().GetHashCode() % 6) + 9;
+            return (ConsoleColor) colIdx;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index e4f8c65..0c6b1df 100644
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -6,9 +6,9 @@
   <appSettings>
   </appSettings>
   <log4net>
-    <appender name="Console" type="log4net.Appender.ConsoleAppender">
+    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%message%newline" />
+        <conversionPattern value="%-5level - %message%newline" />
       </layout>
     </appender>
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">