diff options
| author | Melanie | 2011-12-01 12:16:59 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-01 12:16:59 +0000 |
| commit | b60ff651a3912f7d7830cac40752218efba858d8 (patch) | |
| tree | ba22de2341b996cfeb1f7da31f650e206cb1d76f /OpenSim/Region/CoreModules/World | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Provide more user feedback when "debug http" is set (diff) | |
| download | opensim-SC_OLD-b60ff651a3912f7d7830cac40752218efba858d8.zip opensim-SC_OLD-b60ff651a3912f7d7830cac40752218efba858d8.tar.gz opensim-SC_OLD-b60ff651a3912f7d7830cac40752218efba858d8.tar.bz2 opensim-SC_OLD-b60ff651a3912f7d7830cac40752218efba858d8.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 3963474..c1b8764 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -218,9 +218,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 218 | 218 | ||
| 219 | m_scene.AddCommand(this, "debug permissions", | 219 | m_scene.AddCommand(this, "debug permissions", |
| 220 | "debug permissions <true / false>", | 220 | "debug permissions <true / false>", |
| 221 | "Enable permissions debugging", | 221 | "Turn on permissions debugging", |
| 222 | HandleDebugPermissions); | 222 | HandleDebugPermissions); |
| 223 | |||
| 224 | 223 | ||
| 225 | string grant = myConfig.GetString("GrantLSL",""); | 224 | string grant = myConfig.GetString("GrantLSL",""); |
| 226 | if (grant.Length > 0) { | 225 | if (grant.Length > 0) { |