aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-02-06 03:52:36 +0000
committerJeff Ames2008-02-06 03:52:36 +0000
commitd76d604ce9f749943a6dc6c2260b1375b4ee77b4 (patch)
tree0f5bb1f7a3fe3f3e1de9418832ac5b71901d458a
parentFixed regex in LSL2CSConverter so it will properly handle casting to (string)... (diff)
downloadopensim-SC-d76d604ce9f749943a6dc6c2260b1375b4ee77b4.zip
opensim-SC-d76d604ce9f749943a6dc6c2260b1375b4ee77b4.tar.gz
opensim-SC-d76d604ce9f749943a6dc6c2260b1375b4ee77b4.tar.bz2
opensim-SC-d76d604ce9f749943a6dc6c2260b1375b4ee77b4.tar.xz
Added colors back to console output.
Fixed line duplication in console output.
Diffstat
-rw-r--r--OpenSim/Framework/Console/ConsoleBase.cs10
-rw-r--r--bin/OpenSim.32BitLaunch.exe.config20
-rw-r--r--bin/OpenSim.Grid.AssetServer.exe.config20
-rw-r--r--bin/OpenSim.Grid.GridServer.exe.config20
-rw-r--r--bin/OpenSim.Grid.InventoryServer.exe.config20
-rw-r--r--bin/OpenSim.Grid.MessagingServer.exe.config20
-rw-r--r--bin/OpenSim.Grid.ScriptServer.exe.config20
-rw-r--r--bin/OpenSim.Grid.UserServer.exe.config20
-rw-r--r--bin/OpenSim.exe.config20
-rw-r--r--bin/OpenSimExport.exe.config20
-rw-r--r--bin/SimpleApp.exe.config20
11 files changed, 190 insertions, 20 deletions
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 3f68e50..6ea9b5d 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -179,16 +179,6 @@ namespace OpenSim.Framework.Console
179 { 179 {
180 try 180 try
181 { 181 {
182 System.Console.WriteLine(format, args);
183 }
184
185 catch (FormatException)
186 {
187 System.Console.WriteLine(args);
188 }
189
190 try
191 {
192 if (color != ConsoleColor.White) 182 if (color != ConsoleColor.White)
193 System.Console.ForegroundColor = color; 183 System.Console.ForegroundColor = color;
194 184
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index ebe552b..cb5f4c9 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/OpenSim.Grid.AssetServer.exe.config b/bin/OpenSim.Grid.AssetServer.exe.config
index 21bd6a0..01cda60 100644
--- a/bin/OpenSim.Grid.AssetServer.exe.config
+++ b/bin/OpenSim.Grid.AssetServer.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/OpenSim.Grid.GridServer.exe.config b/bin/OpenSim.Grid.GridServer.exe.config
index 170db91..836c3f4 100644
--- a/bin/OpenSim.Grid.GridServer.exe.config
+++ b/bin/OpenSim.Grid.GridServer.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/OpenSim.Grid.InventoryServer.exe.config b/bin/OpenSim.Grid.InventoryServer.exe.config
index a8e75b1..3a2fd95 100644
--- a/bin/OpenSim.Grid.InventoryServer.exe.config
+++ b/bin/OpenSim.Grid.InventoryServer.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/OpenSim.Grid.MessagingServer.exe.config b/bin/OpenSim.Grid.MessagingServer.exe.config
index 2e240e0..e8c34d2 100644
--- a/bin/OpenSim.Grid.MessagingServer.exe.config
+++ b/bin/OpenSim.Grid.MessagingServer.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/OpenSim.Grid.ScriptServer.exe.config b/bin/OpenSim.Grid.ScriptServer.exe.config
index 5e58f58..026d0f1 100644
--- a/bin/OpenSim.Grid.ScriptServer.exe.config
+++ b/bin/OpenSim.Grid.ScriptServer.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/OpenSim.Grid.UserServer.exe.config b/bin/OpenSim.Grid.UserServer.exe.config
index 63f62ba..5e7b8d5 100644
--- a/bin/OpenSim.Grid.UserServer.exe.config
+++ b/bin/OpenSim.Grid.UserServer.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 9d2aaed..222fe96 100644
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/OpenSimExport.exe.config b/bin/OpenSimExport.exe.config
index fce85b2..5cf4b9f 100644
--- a/bin/OpenSimExport.exe.config
+++ b/bin/OpenSimExport.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
diff --git a/bin/SimpleApp.exe.config b/bin/SimpleApp.exe.config
index 3156c73..8130ef5 100644
--- a/bin/SimpleApp.exe.config
+++ b/bin/SimpleApp.exe.config
@@ -6,7 +6,25 @@
6 <appSettings> 6 <appSettings>
7 </appSettings> 7 </appSettings>
8 <log4net> 8 <log4net>
9 <appender name="Console" type="log4net.Appender.ConsoleAppender"> 9 <appender name="Console" type="log4net.Appender.AnsiColorTerminalAppender">
10 <mapping>
11 <level value="ERROR" />
12 <foreColor value="Red" />
13 <attributes value="Bright"/>
14 </mapping>
15 <mapping>
16 <level value="DEBUG"/>
17 <foreColor value="Green"/>
18 </mapping>
19 <mapping>
20 <level value="INFO"/>
21 <foreColor value="Blue"/>
22 </mapping>
23 <mapping>
24 <level value="Warn"/>
25 <foreColor value="Yellow"/>
26 <attributes value="Bright"/>
27 </mapping>
10 <layout type="log4net.Layout.PatternLayout"> 28 <layout type="log4net.Layout.PatternLayout">
11 <conversionPattern value="%date %-5level %logger - %message%newline" /> 29 <conversionPattern value="%date %-5level %logger - %message%newline" />
12 </layout> 30 </layout>
generated by cgit v1.1 at 2024-12-13 08:50:14 +0000