diff options
| author | UbitUmarov | 2017-01-07 16:55:03 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-07 16:55:03 +0000 |
| commit | add27a503e2558b7ddeb951d3e42e09b1c04fb36 (patch) | |
| tree | 888ab5919cb52f1e0201fc4ab60987a0df022f1f /bin | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | update permissions module with the new options (diff) | |
| download | opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.zip opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.gz opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.bz2 opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 616061d..0170a27 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -483,10 +483,6 @@ | |||
| 483 | ; Allow region managers to assume god powers in regions they manage | 483 | ; Allow region managers to assume god powers in regions they manage |
| 484 | ;region_manager_is_god = false | 484 | ;region_manager_is_god = false |
| 485 | 485 | ||
| 486 | ; Allow parcel owners to assume god powers in their parcels | ||
| 487 | ; you really do not want this... | ||
| 488 | ;parcel_owner_is_god = false | ||
| 489 | |||
| 490 | ; God mode should be turned on in the viewer whenever | 486 | ; God mode should be turned on in the viewer whenever |
| 491 | ; the user has god rights somewhere. They may choose | 487 | ; the user has god rights somewhere. They may choose |
| 492 | ; to turn it off again, though. | 488 | ; to turn it off again, though. |