aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-08 02:17:45 +0000
committerJustin Clark-Casey (justincc)2012-03-08 02:17:45 +0000
commit650d761c06149b59148e57e90cb47dcfa8d65f6a (patch)
treef4624d2146a638187cbaa2d11d4b83d0e319ec87 /OpenSim/Region/Application
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-650d761c06149b59148e57e90cb47dcfa8d65f6a.zip
opensim-SC_OLD-650d761c06149b59148e57e90cb47dcfa8d65f6a.tar.gz
opensim-SC_OLD-650d761c06149b59148e57e90cb47dcfa8d65f6a.tar.bz2
opensim-SC_OLD-650d761c06149b59148e57e90cb47dcfa8d65f6a.tar.xz
Display help commander topics in capitalized form - the commands themselves are still lowercase.
Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 27a58a4..d3c1102 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -242,8 +242,10 @@ namespace OpenSim
242 242
243 foreach (string topic in topics) 243 foreach (string topic in topics)
244 { 244 {
245 m_console.Commands.AddCommand(topic, false, "help " + topic, 245 string capitalizedTopic = char.ToUpper(topic[0]) + topic.Substring(1);
246 "help " + topic, 246
247 m_console.Commands.AddCommand(capitalizedTopic, false, "help " + capitalizedTopic,
248 "help " + capitalizedTopic,
247 "Get help on plugin command '" + topic + "'", 249 "Get help on plugin command '" + topic + "'",
248 HandleCommanderHelp); 250 HandleCommanderHelp);
249// 251//
@@ -267,7 +269,7 @@ namespace OpenSim
267 269
268 foreach (string command in commander.Commands.Keys) 270 foreach (string command in commander.Commands.Keys)
269 { 271 {
270 m_console.Commands.AddCommand(topic, false, 272 m_console.Commands.AddCommand(capitalizedTopic, false,
271 topic + " " + command, 273 topic + " " + command,
272 topic + " " + commander.Commands[command].ShortHelp(), 274 topic + " " + commander.Commands[command].ShortHelp(),
273 String.Empty, HandleCommanderCommand); 275 String.Empty, HandleCommanderCommand);
@@ -286,7 +288,7 @@ namespace OpenSim
286 // Only safe for the interactive console, since it won't 288 // Only safe for the interactive console, since it won't
287 // let us come here unless both scene and commander exist 289 // let us come here unless both scene and commander exist
288 // 290 //
289 ICommander moduleCommander = SceneManager.CurrentOrFirstScene.GetCommander(cmd[1]); 291 ICommander moduleCommander = SceneManager.CurrentOrFirstScene.GetCommander(cmd[1].ToLower());
290 if (moduleCommander != null) 292 if (moduleCommander != null)
291 m_console.Output(moduleCommander.Help); 293 m_console.Output(moduleCommander.Help);
292 } 294 }