diff options
author | Teravus Ovares | 2007-11-22 21:40:53 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-22 21:40:53 +0000 |
commit | f97aeab9163fb24bee16a0a85328a8d177b046fb (patch) | |
tree | 7a440ca4c320666c100ffb7a9b3075d840e3baba /OpenSim/Framework | |
parent | Created a client driven packet throttler. The sim now respects the client's ... (diff) | |
download | opensim-SC-f97aeab9163fb24bee16a0a85328a8d177b046fb.zip opensim-SC-f97aeab9163fb24bee16a0a85328a8d177b046fb.tar.gz opensim-SC-f97aeab9163fb24bee16a0a85328a8d177b046fb.tar.bz2 opensim-SC-f97aeab9163fb24bee16a0a85328a8d177b046fb.tar.xz |
* Quelled a Log format exception in the logging routines.
* Tweaked some esoteric throttle settings
* Removed AgentThrottle from the unsupported packet list.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Console/LogBase.cs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs index 6651e5d..ec3c5bc 100644 --- a/OpenSim/Framework/Console/LogBase.cs +++ b/OpenSim/Framework/Console/LogBase.cs | |||
@@ -238,9 +238,16 @@ namespace OpenSim.Framework.Console | |||
238 | { | 238 | { |
239 | string now = DateTime.Now.ToString("[MM-dd hh:mm:ss] "); | 239 | string now = DateTime.Now.ToString("[MM-dd hh:mm:ss] "); |
240 | Log.Write(now); | 240 | Log.Write(now); |
241 | Log.WriteLine(format, args); | 241 | try |
242 | Log.Flush(); | 242 | { |
243 | Log.WriteLine(format, args); | ||
244 | Log.Flush(); | ||
245 | } | ||
243 | 246 | ||
247 | catch (FormatException FE) | ||
248 | { | ||
249 | System.Console.WriteLine(args); | ||
250 | } | ||
244 | System.Console.Write(now); | 251 | System.Console.Write(now); |
245 | try | 252 | try |
246 | { | 253 | { |
@@ -255,6 +262,12 @@ namespace OpenSim.Framework.Console | |||
255 | // Some older systems dont support coloured text. | 262 | // Some older systems dont support coloured text. |
256 | System.Console.WriteLine(format, args); | 263 | System.Console.WriteLine(format, args); |
257 | } | 264 | } |
265 | catch (System.FormatException) | ||
266 | { | ||
267 | // Some older systems dont support coloured text. | ||
268 | System.Console.WriteLine(args); | ||
269 | } | ||
270 | |||
258 | return; | 271 | return; |
259 | } | 272 | } |
260 | } | 273 | } |