aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/GridService
diff options
context:
space:
mode:
authorMelanie2012-03-08 19:10:22 +0000
committerMelanie2012-03-08 19:10:22 +0000
commitb0fc96c17d818ab7a57d7d84e26ca8138b3985a4 (patch)
treea50cda2fed5359b83e63ed3df41bdc3a8b7198d7 /OpenSim/Services/GridService
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/Services/GridService')
-rw-r--r--OpenSim/Services/GridService/GridService.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 89f0716..3dc87bc 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -84,14 +84,14 @@ namespace OpenSim.Services.GridService
84 84
85 if (MainConsole.Instance != null) 85 if (MainConsole.Instance != null)
86 { 86 {
87 MainConsole.Instance.Commands.AddCommand("grid", true, 87 MainConsole.Instance.Commands.AddCommand("Regions", true,
88 "show region", 88 "show region",
89 "show region <Region name>", 89 "show region <Region name>",
90 "Show details on a region", 90 "Show details on a region",
91 String.Empty, 91 String.Empty,
92 HandleShowRegion); 92 HandleShowRegion);
93 93
94 MainConsole.Instance.Commands.AddCommand("grid", true, 94 MainConsole.Instance.Commands.AddCommand("Regions", true,
95 "set region flags", 95 "set region flags",
96 "set region flags <Region name> <flags>", 96 "set region flags <Region name> <flags>",
97 "Set database flags for region", 97 "Set database flags for region",