aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-01-21 23:07:19 +0000
committerJustin Clark-Casey (justincc)2011-01-21 23:07:19 +0000
commite44ceaaea3ec42fad63c5437e57e8c96a74e64e0 (patch)
tree26f468e136bce686e41f329038e137e8573393bb
parentadd current console log level to "show info" (diff)
downloadopensim-SC_OLD-e44ceaaea3ec42fad63c5437e57e8c96a74e64e0.zip
opensim-SC_OLD-e44ceaaea3ec42fad63c5437e57e8c96a74e64e0.tar.gz
opensim-SC_OLD-e44ceaaea3ec42fad63c5437e57e8c96a74e64e0.tar.bz2
opensim-SC_OLD-e44ceaaea3ec42fad63c5437e57e8c96a74e64e0.tar.xz
make "show info" and "show version" show the same version text
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 6eb7686..147fbd5 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -388,20 +388,23 @@ namespace OpenSim.Framework.Servers
388 break; 388 break;
389 389
390 case "version": 390 case "version":
391 Notice( 391 Notice(GetVersionText());
392 String.Format(
393 "Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion));
394 break; 392 break;
395 } 393 }
396 } 394 }
397 395
398 protected void ShowInfo() 396 protected void ShowInfo()
399 { 397 {
400 Notice("Version: " + m_version); 398 Notice(GetVersionText());
401 Notice("Startup directory: " + m_startupDirectory); 399 Notice("Startup directory: " + m_startupDirectory);
402 if (null != m_consoleAppender) 400 if (null != m_consoleAppender)
403 Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold)); 401 Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));
404 } 402 }
403
404 protected string GetVersionText()
405 {
406 return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion);
407 }
405 408
406 /// <summary> 409 /// <summary>
407 /// Console output is only possible if a console has been established. 410 /// Console output is only possible if a console has been established.