diff options
author | UbitUmarov | 2016-11-27 15:14:34 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-27 15:14:34 +0000 |
commit | 877d3092b45723a2fe8b3a5bbc224cd5d5e55e82 (patch) | |
tree | f11a5b2d85443fefc81e1958c82828a16fc656cc /bin/OpenSim.ini.example | |
parent | fix pool parameters for httptests (diff) | |
parent | HG on links request build the URI in http format with a / at end, this should... (diff) | |
download | opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.zip opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.gz opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.bz2 opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSim.ini.example | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index b9e3351..4df6584 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -397,10 +397,6 @@ | |||
397 | ;; Allow region managers to assume god powers in regions they manage | 397 | ;; Allow region managers to assume god powers in regions they manage |
398 | ; region_manager_is_god = false | 398 | ; region_manager_is_god = false |
399 | 399 | ||
400 | ;# {parcel_owner_is_god} {} {Allow parcel owner gods} {true false} false | ||
401 | ;; Allow parcel owners to assume god powers in their parcels | ||
402 | ; parcel_owner_is_god = false | ||
403 | |||
404 | ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false | 400 | ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false |
405 | ;; More control over permissions | 401 | ;; More control over permissions |
406 | ;; This is definitely not SL! | 402 | ;; This is definitely not SL! |