diff options
| author | Mic Bowman | 2011-02-04 14:22:17 -0800 |
|---|---|---|
| committer | Mic Bowman | 2011-02-04 14:22:17 -0800 |
| commit | bb69a40fbb563503e594bc9576a28c440a808ef2 (patch) | |
| tree | b5246768e592bf80c396a4d2df377059097322f8 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | Convert SimianMaptile refresh time from ms to seconds. Too many 0's (diff) | |
| parent | minor: fix indentation, spacing on commit 3585130 (diff) | |
| download | opensim-SC-bb69a40fbb563503e594bc9576a28c440a808ef2.zip opensim-SC-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.gz opensim-SC-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.bz2 opensim-SC-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index b28ad69..21e1e09 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -319,18 +319,21 @@ namespace OpenSim.Framework.Servers | |||
| 319 | return; | 319 | return; |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | string rawLevel = cmd[3]; | 322 | if (cmd.Length > 3) |
| 323 | 323 | { | |
| 324 | ILoggerRepository repository = LogManager.GetRepository(); | 324 | string rawLevel = cmd[3]; |
| 325 | Level consoleLevel = repository.LevelMap[rawLevel]; | 325 | |
| 326 | 326 | ILoggerRepository repository = LogManager.GetRepository(); | |
| 327 | if (consoleLevel != null) | 327 | Level consoleLevel = repository.LevelMap[rawLevel]; |
| 328 | m_consoleAppender.Threshold = consoleLevel; | 328 | |
| 329 | else | 329 | if (consoleLevel != null) |
| 330 | Notice( | 330 | m_consoleAppender.Threshold = consoleLevel; |
| 331 | String.Format( | 331 | else |
| 332 | "{0} is not a valid logging level. Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF", | 332 | Notice( |
| 333 | rawLevel)); | 333 | String.Format( |
| 334 | "{0} is not a valid logging level. Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF", | ||
| 335 | rawLevel)); | ||
| 336 | } | ||
| 334 | 337 | ||
| 335 | Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold)); | 338 | Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold)); |
| 336 | } | 339 | } |