Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 11 insertions, 2 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>