aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/ServicesServerBase.cs
diff options
context:
space:
mode:
authorMelanie2012-03-08 19:10:22 +0000
committerMelanie2012-03-08 19:10:22 +0000
commitb0fc96c17d818ab7a57d7d84e26ca8138b3985a4 (patch)
treea50cda2fed5359b83e63ed3df41bdc3a8b7198d7 /OpenSim/Server/Base/ServicesServerBase.cs
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentMove "change region" command into general category (diff)
downloadopensim-SC_OLD-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.zip
opensim-SC_OLD-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.gz
opensim-SC_OLD-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.bz2
opensim-SC_OLD-b0fc96c17d818ab7a57d7d84e26ca8138b3985a4.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server/Base/ServicesServerBase.cs')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index a6f4e47..36c48e6 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -236,16 +236,16 @@ namespace OpenSim.Server.Base
236 236
237 // Register the quit command 237 // Register the quit command
238 // 238 //
239 MainConsole.Instance.Commands.AddCommand("base", false, "quit", 239 MainConsole.Instance.Commands.AddCommand("General", false, "quit",
240 "quit", 240 "quit",
241 "Quit the application", HandleQuit); 241 "Quit the application", HandleQuit);
242 242
243 MainConsole.Instance.Commands.AddCommand("base", false, "shutdown", 243 MainConsole.Instance.Commands.AddCommand("General", false, "shutdown",
244 "shutdown", 244 "shutdown",
245 "Quit the application", HandleQuit); 245 "Quit the application", HandleQuit);
246 246
247 // Register a command to read other commands from a file 247 // Register a command to read other commands from a file
248 MainConsole.Instance.Commands.AddCommand("base", false, "command-script", 248 MainConsole.Instance.Commands.AddCommand("General", false, "command-script",
249 "command-script <script>", 249 "command-script <script>",
250 "Run a command script from file", HandleScript); 250 "Run a command script from file", HandleScript);
251 251