diff options
author | Justin Clarke Casey | 2009-02-09 20:52:04 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-09 20:52:04 +0000 |
commit | a034b640dab9d08b23270e1ee8255ae92fa8f816 (patch) | |
tree | be960c46df5062b5e9e2d1e17fe402ef0596fadd /OpenSim/Region | |
parent | a last set of files that seem to have embedded ^M in them (diff) | |
download | opensim-SC_OLD-a034b640dab9d08b23270e1ee8255ae92fa8f816.zip opensim-SC_OLD-a034b640dab9d08b23270e1ee8255ae92fa8f816.tar.gz opensim-SC_OLD-a034b640dab9d08b23270e1ee8255ae92fa8f816.tar.bz2 opensim-SC_OLD-a034b640dab9d08b23270e1ee8255ae92fa8f816.tar.xz |
* Add the ability to type help <command> for more detailed help about a specific command if any is available
Diffstat (limited to 'OpenSim/Region')
4 files changed, 16 insertions, 11 deletions
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 | |||
142 | 142 | ||
143 | m_console.Commands.AddCommand("region", "save oar", | 143 | m_console.Commands.AddCommand("region", "save oar", |
144 | "save oar <oar name>", | 144 | "save oar <oar name>", |
145 | "Save a region's data to an OAR archive", SaveOar); | 145 | "Save a region's data to an OAR archive", |
146 | "More information on forthcoming options here soon", SaveOar); | ||
146 | 147 | ||
147 | m_console.Commands.AddCommand("region", "save inventory", | 148 | m_console.Commands.AddCommand("region", "save inventory", |
148 | "save inventory <first> <last> <path> <file>", | 149 | "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 | |||
203 | 203 | ||
204 | foreach (string topic in topics) | 204 | foreach (string topic in topics) |
205 | { | 205 | { |
206 | m_console.Commands.AddCommand("plugin", "help "+topic, | 206 | m_console.Commands.AddCommand("plugin", "help " + topic, |
207 | "help "+topic, | 207 | "help " + topic, |
208 | "Get help on plugin command '"+topic+"'", | 208 | "Get help on plugin command '" + topic + "'", |
209 | HandleCommanderHelp); | 209 | HandleCommanderHelp); |
210 | 210 | ||
211 | m_console.Commands.AddCommand("plugin", topic, | 211 | m_console.Commands.AddCommand("plugin", topic, |
212 | topic, | 212 | topic, |
213 | "Execute subcommand for plugin '"+topic+"'", | 213 | "Execute subcommand for plugin '" + topic + "'", |
214 | null); | 214 | null); |
215 | 215 | ||
216 | ICommander commander = | 216 | ICommander commander = |
@@ -221,8 +221,8 @@ namespace OpenSim | |||
221 | 221 | ||
222 | foreach (string command in commander.Commands.Keys) | 222 | foreach (string command in commander.Commands.Keys) |
223 | { | 223 | { |
224 | m_console.Commands.AddCommand(topic, topic+" "+command, | 224 | m_console.Commands.AddCommand(topic, topic + " " + command, |
225 | topic+" "+commander.Commands[command].ShortHelp(), | 225 | topic + " " + commander.Commands[command].ShortHelp(), |
226 | String.Empty, HandleCommanderCommand); | 226 | String.Empty, HandleCommanderCommand); |
227 | } | 227 | } |
228 | } | 228 | } |
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 | |||
64 | 64 | ||
65 | public void Close() | 65 | public void Close() |
66 | { | 66 | { |
67 | } | 67 | } |
68 | 68 | ||
69 | public void ArchiveRegion(string savePath) | 69 | public void ArchiveRegion(string savePath) |
70 | { | 70 | { |
71 | m_log.InfoFormat("[SCENE]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath); | 71 | m_log.InfoFormat( |
72 | "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath); | ||
72 | 73 | ||
73 | new ArchiveWriteRequestPreparation(m_scene, savePath).ArchiveRegion(); | 74 | new ArchiveWriteRequestPreparation(m_scene, savePath).ArchiveRegion(); |
74 | } | 75 | } |
@@ -80,7 +81,8 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
80 | 81 | ||
81 | public void DearchiveRegion(string loadPath) | 82 | public void DearchiveRegion(string loadPath) |
82 | { | 83 | { |
83 | m_log.InfoFormat("[SCENE]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); | 84 | m_log.InfoFormat( |
85 | "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); | ||
84 | 86 | ||
85 | new ArchiveReadRequest(m_scene, loadPath).DearchiveRegion(); | 87 | new ArchiveReadRequest(m_scene, loadPath).DearchiveRegion(); |
86 | } | 88 | } |
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 | |||
204 | 204 | ||
205 | m_bypassPermissions = val; | 205 | m_bypassPermissions = val; |
206 | 206 | ||
207 | m_log.InfoFormat("[PERMISSIONS] Set permissions bypass to {0} for {1}", m_bypassPermissions, m_scene.RegionInfo.RegionName); | 207 | m_log.InfoFormat( |
208 | "[PERMISSIONS]: Set permissions bypass to {0} for {1}", | ||
209 | m_bypassPermissions, m_scene.RegionInfo.RegionName); | ||
208 | } | 210 | } |
209 | } | 211 | } |
210 | 212 | ||