aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-02-04 17:11:35 +0000
committerJustin Clark-Casey (justincc)2011-02-04 17:11:35 +0000
commitba8826d2b8362890fd97d9878b2b9cb7b5488669 (patch)
tree3eaeebf327fcb4cef3a7070676785ef7649432a6 /OpenSim
parentMake UUID 3a367d1c-bef1-6d43-7595-e88c1e3aadb3 reference a full alpha texture. (diff)
downloadopensim-SC_OLD-ba8826d2b8362890fd97d9878b2b9cb7b5488669.zip
opensim-SC_OLD-ba8826d2b8362890fd97d9878b2b9cb7b5488669.tar.gz
opensim-SC_OLD-ba8826d2b8362890fd97d9878b2b9cb7b5488669.tar.bz2
opensim-SC_OLD-ba8826d2b8362890fd97d9878b2b9cb7b5488669.tar.xz
Fix "set log level" to once again display current log level if it's not given a parameter
This addresses http://opensimulator.org/mantis/view.php?id=5345
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs27
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 }