aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Console
diff options
context:
space:
mode:
authorAdam Frisby2007-10-22 15:23:48 +0000
committerAdam Frisby2007-10-22 15:23:48 +0000
commitc4707a284ffecf81e8ca60a1019e234339222631 (patch)
treebff5da1d8ecf39b0b4578ebec0b8b3dc86c03d85 /OpenSim/Framework/Console
parentattempt to fix the muliple repeat problem (that sdague is getting) in the IRC... (diff)
downloadopensim-SC-c4707a284ffecf81e8ca60a1019e234339222631.zip
opensim-SC-c4707a284ffecf81e8ca60a1019e234339222631.tar.gz
opensim-SC-c4707a284ffecf81e8ca60a1019e234339222631.tar.bz2
opensim-SC-c4707a284ffecf81e8ca60a1019e234339222631.tar.xz
* 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
Diffstat (limited to 'OpenSim/Framework/Console')
-rw-r--r--OpenSim/Framework/Console/LogBase.cs63
1 files changed, 32 insertions, 31 deletions
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
170 /// <param name="args">WriteLine-style message arguments</param> 170 /// <param name="args">WriteLine-style message arguments</param>
171 public void Verbose(string format, params object[] args) 171 public void Verbose(string format, params object[] args)
172 { 172 {
173 WriteNewLine(ConsoleColor.Gray, format, args); 173 if (!m_silent)
174 return; 174 {
175 WriteNewLine(ConsoleColor.Gray, format, args);
176 return;
177 }
175 } 178 }
176 179
177 /// <summary> 180 /// <summary>
@@ -182,9 +185,12 @@ namespace OpenSim.Framework.Console
182 /// <param name="args">WriteLine-style message arguments</param> 185 /// <param name="args">WriteLine-style message arguments</param>
183 public void Verbose(string sender, string format, params object[] args) 186 public void Verbose(string sender, string format, params object[] args)
184 { 187 {
185 WritePrefixLine(DeriveColor(sender), sender); 188 if (!m_silent)
186 WriteNewLine(ConsoleColor.Gray, format, args); 189 {
187 return; 190 WritePrefixLine(DeriveColor(sender), sender);
191 WriteNewLine(ConsoleColor.Gray, format, args);
192 return;
193 }
188 } 194 }
189 195
190 /// <summary> 196 /// <summary>
@@ -234,22 +240,20 @@ namespace OpenSim.Framework.Console
234 Log.Write(now); 240 Log.Write(now);
235 Log.WriteLine(format, args); 241 Log.WriteLine(format, args);
236 Log.Flush(); 242 Log.Flush();
237 if (!m_silent) 243
244 System.Console.Write(now);
245 try
238 { 246 {
239 System.Console.Write(now); 247 if (color != ConsoleColor.White)
240 try 248 System.Console.ForegroundColor = color;
241 {
242 if (color != ConsoleColor.White)
243 System.Console.ForegroundColor = color;
244 249
245 System.Console.WriteLine(format, args); 250 System.Console.WriteLine(format, args);
246 System.Console.ResetColor(); 251 System.Console.ResetColor();
247 } 252 }
248 catch (ArgumentNullException) 253 catch (ArgumentNullException)
249 { 254 {
250 // Some older systems dont support coloured text. 255 // Some older systems dont support coloured text.
251 System.Console.WriteLine(format, args); 256 System.Console.WriteLine(format, args);
252 }
253 } 257 }
254 return; 258 return;
255 } 259 }
@@ -265,19 +269,16 @@ namespace OpenSim.Framework.Console
265 269
266 System.Console.Write("["); 270 System.Console.Write("[");
267 271
268 if (!m_silent) 272 try
269 { 273 {
270 try 274 System.Console.ForegroundColor = color;
271 { 275 System.Console.Write(sender);
272 System.Console.ForegroundColor = color; 276 System.Console.ResetColor();
273 System.Console.Write(sender); 277 }
274 System.Console.ResetColor(); 278 catch (ArgumentNullException)
275 } 279 {
276 catch (ArgumentNullException) 280 // Some older systems dont support coloured text.
277 { 281 System.Console.WriteLine(sender);
278 // Some older systems dont support coloured text.
279 System.Console.WriteLine(sender);
280 }
281 } 282 }
282 283
283 System.Console.Write("] \t"); 284 System.Console.Write("] \t");