From a034b640dab9d08b23270e1ee8255ae92fa8f816 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 9 Feb 2009 20:52:04 +0000
Subject: * Add the ability to type help <command> for more detailed help about
 a specific command if any is available

---
 OpenSim/Region/Application/OpenSim.cs                        |  3 ++-
 OpenSim/Region/Application/OpenSimBase.cs                    | 12 ++++++------
 .../Environment/Modules/World/Archiver/ArchiverModule.cs     |  8 +++++---
 .../Modules/World/Permissions/PermissionsModule.cs           |  4 +++-
 4 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 5bce225..d706e05 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -142,7 +142,8 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("region", "save oar",
                     "save oar <oar name>",
-                    "Save a region's data to an OAR archive", SaveOar);
+                    "Save a region's data to an OAR archive",
+                    "More information on forthcoming options here soon", SaveOar);
 
             m_console.Commands.AddCommand("region", "save inventory",
                     "save inventory <first> <last> <path> <file>",
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 4d56147..d032864 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -203,14 +203,14 @@ namespace OpenSim
 
             foreach (string topic in topics)
             {
-                m_console.Commands.AddCommand("plugin", "help "+topic,
-                        "help "+topic,
-                        "Get help on plugin command '"+topic+"'",
+                m_console.Commands.AddCommand("plugin", "help " + topic,
+                        "help " + topic,
+                        "Get help on plugin command '" + topic + "'",
                         HandleCommanderHelp);
 
                 m_console.Commands.AddCommand("plugin", topic,
                         topic,
-                        "Execute subcommand for plugin '"+topic+"'",
+                        "Execute subcommand for plugin '" + topic + "'",
                         null);
 
                 ICommander commander =
@@ -221,8 +221,8 @@ namespace OpenSim
 
                 foreach (string command in commander.Commands.Keys)
                 {
-                    m_console.Commands.AddCommand(topic, topic+" "+command,
-                            topic+" "+commander.Commands[command].ShortHelp(),
+                    m_console.Commands.AddCommand(topic, topic + " " + command,
+                            topic + " " + commander.Commands[command].ShortHelp(),
                             String.Empty, HandleCommanderCommand);
                 }
             }
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
index ed494fc..cd81169 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs
@@ -64,11 +64,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
         public void Close()
         {
-        }
+        }                
 
         public void ArchiveRegion(string savePath)
         {
-            m_log.InfoFormat("[SCENE]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath);
+            m_log.InfoFormat(
+                "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath);
             
             new ArchiveWriteRequestPreparation(m_scene, savePath).ArchiveRegion();
         }
@@ -80,7 +81,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
 
         public void DearchiveRegion(string loadPath)
         {
-            m_log.InfoFormat("[SCENE]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath);
+            m_log.InfoFormat(
+                "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath);
             
             new ArchiveReadRequest(m_scene, loadPath).DearchiveRegion();
         }
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index e48ef13..8838e39 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -204,7 +204,9 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
 
                 m_bypassPermissions = val;
 
-                m_log.InfoFormat("[PERMISSIONS] Set permissions bypass to {0} for {1}", m_bypassPermissions, m_scene.RegionInfo.RegionName);
+                m_log.InfoFormat(
+                    "[PERMISSIONS]: Set permissions bypass to {0} for {1}", 
+                    m_bypassPermissions, m_scene.RegionInfo.RegionName);
             }
         }
 
-- 
cgit v1.1