diff options
author | Melanie | 2012-03-08 19:10:22 +0000 |
---|---|---|
committer | Melanie | 2012-03-08 19:10:22 +0000 |
commit | b0fc96c17d818ab7a57d7d84e26ca8138b3985a4 (patch) | |
tree | a50cda2fed5359b83e63ed3df41bdc3a8b7198d7 /OpenSim/Region/Application/OpenSimBase.cs | |
parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
parent | Move "change region" command into general category (diff) | |
download | opensim-SC-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.zip opensim-SC-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.gz opensim-SC-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.bz2 opensim-SC-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 80bff17..34f513d 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -257,15 +257,17 @@ namespace OpenSim | |||
257 | 257 | ||
258 | foreach (string topic in topics) | 258 | foreach (string topic in topics) |
259 | { | 259 | { |
260 | m_console.Commands.AddCommand("plugin", false, "help " + topic, | 260 | string capitalizedTopic = char.ToUpper(topic[0]) + topic.Substring(1); |
261 | "help " + topic, | 261 | |
262 | m_console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic, | ||
263 | "help " + capitalizedTopic, | ||
262 | "Get help on plugin command '" + topic + "'", | 264 | "Get help on plugin command '" + topic + "'", |
263 | HandleCommanderHelp); | 265 | HandleCommanderHelp); |
264 | 266 | // | |
265 | m_console.Commands.AddCommand("plugin", false, topic, | 267 | // m_console.Commands.AddCommand("General", false, topic, |
266 | topic, | 268 | // topic, |
267 | "Execute subcommand for plugin '" + topic + "'", | 269 | // "Execute subcommand for plugin '" + topic + "'", |
268 | null); | 270 | // null); |
269 | 271 | ||
270 | ICommander commander = null; | 272 | ICommander commander = null; |
271 | 273 | ||
@@ -282,7 +284,7 @@ namespace OpenSim | |||
282 | 284 | ||
283 | foreach (string command in commander.Commands.Keys) | 285 | foreach (string command in commander.Commands.Keys) |
284 | { | 286 | { |
285 | m_console.Commands.AddCommand(topic, false, | 287 | m_console.Commands.AddCommand(capitalizedTopic, false, |
286 | topic + " " + command, | 288 | topic + " " + command, |
287 | topic + " " + commander.Commands[command].ShortHelp(), | 289 | topic + " " + commander.Commands[command].ShortHelp(), |
288 | String.Empty, HandleCommanderCommand); | 290 | String.Empty, HandleCommanderCommand); |
@@ -301,7 +303,7 @@ namespace OpenSim | |||
301 | // Only safe for the interactive console, since it won't | 303 | // Only safe for the interactive console, since it won't |
302 | // let us come here unless both scene and commander exist | 304 | // let us come here unless both scene and commander exist |
303 | // | 305 | // |
304 | ICommander moduleCommander = SceneManager.CurrentOrFirstScene.GetCommander(cmd[1]); | 306 | ICommander moduleCommander = SceneManager.CurrentOrFirstScene.GetCommander(cmd[1].ToLower()); |
305 | if (moduleCommander != null) | 307 | if (moduleCommander != null) |
306 | m_console.Output(moduleCommander.Help); | 308 | m_console.Output(moduleCommander.Help); |
307 | } | 309 | } |