Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2017-01-07 16:55:03 +00:00
23 changed files with 485 additions and 363 deletions

View File

@@ -483,10 +483,6 @@
; Allow region managers to assume god powers in regions they manage
;region_manager_is_god = false
; Allow parcel owners to assume god powers in their parcels
; you really do not want this...
;parcel_owner_is_god = false
; God mode should be turned on in the viewer whenever
; the user has god rights somewhere. They may choose
; to turn it off again, though.