Merge branch 'master' into careminster-presence-refactor

2 files changed, 16 insertions, 3 deletions

diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 66f483c..b17dbc0 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -141,7 +141,17 @@ namespace OpenSim.Framework.Console
                 CommandInfo commandInfo = (CommandInfo)dict[String.Empty];
                 help.Add(commandInfo.help_text);
                 help.Add(commandInfo.long_help);
+
+                string descriptiveHelp = commandInfo.descriptive_help;
+
+                // If we do have some descriptive help then insert a spacing line before and after for readability.
+                if (descriptiveHelp != string.Empty)
+                    help.Add(string.Empty);
+                
                 help.Add(commandInfo.descriptive_help);
+
+                if (descriptiveHelp != string.Empty)
+                    help.Add(string.Empty);                
             }
             else
             {
@@ -182,8 +192,7 @@ namespace OpenSim.Framework.Console
         public void AddCommand(string module, bool shared, string command,
                 string help, string longhelp, CommandDelegate fn)
         {
-            AddCommand(module, shared, command, help, longhelp,
-                    String.Empty, fn);
+            AddCommand(module, shared, command, help, longhelp, String.Empty, fn);
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 655df9d..f0f8d01 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -286,7 +286,11 @@ namespace OpenSim.Framework.Servers
 
             EnhanceVersionInformation();
             
-            m_log.Info("[STARTUP]: Version: " + m_version + "\n");
+            m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine);
+            // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
+            // the clr version number doesn't match the project version number under Mono.
+            //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
+            m_log.Info("[STARTUP]: Operating system version: " + Environment.OSVersion + Environment.NewLine);
             
             StartupSpecific();