diff options
author | Melanie | 2012-06-15 15:59:49 +0100 |
---|---|---|
committer | Melanie | 2012-06-15 15:59:49 +0100 |
commit | 32cc9c6094b335254e3e44d9d2695d44281d5496 (patch) | |
tree | 873704e740bda73f3c8178eae7944073790da505 /OpenSim/Region/CoreModules | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | Add region name to UseCircuitCode log messages (diff) | |
download | opensim-SC-32cc9c6094b335254e3e44d9d2695d44281d5496.zip opensim-SC-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.gz opensim-SC-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.bz2 opensim-SC-32cc9c6094b335254e3e44d9d2695d44281d5496.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 8c97f58..9a542a3 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
221 | "Force permissions on or off", | 221 | "Force permissions on or off", |
222 | HandleForcePermissions); | 222 | HandleForcePermissions); |
223 | 223 | ||
224 | m_scene.AddCommand("Users", this, "debug permissions", | 224 | m_scene.AddCommand("Debug", this, "debug permissions", |
225 | "debug permissions <true / false>", | 225 | "debug permissions <true / false>", |
226 | "Turn on permissions debugging", | 226 | "Turn on permissions debugging", |
227 | HandleDebugPermissions); | 227 | HandleDebugPermissions); |