From c4707a284ffecf81e8ca60a1019e234339222631 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 22 Oct 2007 15:23:48 +0000
Subject: * Major ass commit. * Sqlite Storage Engine now supports terrain --
however be aware that every terrain revision stored will at 512KB to your
database file. At the moment it is storing every revision from the first. *
Fixed an issue where by noverbose mode would display lots of useless junk.
Noverbose mode is now quite usable. * Fixed a whole bunch of console message
issues such as naming and categorisation
---
OpenSim/Framework/Console/LogBase.cs | 63 ++++++++++++++++++------------------
1 file changed, 32 insertions(+), 31 deletions(-)
(limited to 'OpenSim/Framework/Console/LogBase.cs')
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 5a7ce4d..246afa1 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -170,8 +170,11 @@ namespace OpenSim.Framework.Console
/// WriteLine-style message arguments
public void Verbose(string format, params object[] args)
{
- WriteNewLine(ConsoleColor.Gray, format, args);
- return;
+ if (!m_silent)
+ {
+ WriteNewLine(ConsoleColor.Gray, format, args);
+ return;
+ }
}
///
@@ -182,9 +185,12 @@ namespace OpenSim.Framework.Console
/// WriteLine-style message arguments
public void Verbose(string sender, string format, params object[] args)
{
- WritePrefixLine(DeriveColor(sender), sender);
- WriteNewLine(ConsoleColor.Gray, format, args);
- return;
+ if (!m_silent)
+ {
+ WritePrefixLine(DeriveColor(sender), sender);
+ WriteNewLine(ConsoleColor.Gray, format, args);
+ return;
+ }
}
///
@@ -234,22 +240,20 @@ namespace OpenSim.Framework.Console
Log.Write(now);
Log.WriteLine(format, args);
Log.Flush();
- if (!m_silent)
+
+ System.Console.Write(now);
+ try
{
- System.Console.Write(now);
- try
- {
- if (color != ConsoleColor.White)
- System.Console.ForegroundColor = color;
+ if (color != ConsoleColor.White)
+ System.Console.ForegroundColor = color;
- System.Console.WriteLine(format, args);
- System.Console.ResetColor();
- }
- catch (ArgumentNullException)
- {
- // Some older systems dont support coloured text.
- System.Console.WriteLine(format, args);
- }
+ System.Console.WriteLine(format, args);
+ System.Console.ResetColor();
+ }
+ catch (ArgumentNullException)
+ {
+ // Some older systems dont support coloured text.
+ System.Console.WriteLine(format, args);
}
return;
}
@@ -265,19 +269,16 @@ namespace OpenSim.Framework.Console
System.Console.Write("[");
- if (!m_silent)
+ try
{
- 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);
- }
+ System.Console.ForegroundColor = color;
+ System.Console.Write(sender);
+ System.Console.ResetColor();
+ }
+ catch (ArgumentNullException)
+ {
+ // Some older systems dont support coloured text.
+ System.Console.WriteLine(sender);
}
System.Console.Write("] \t");
--
cgit v1.1