diff options
| author | Melanie Thielker | 2017-01-06 17:07:44 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-06 17:07:44 +0000 |
| commit | 8ab7e047bf50954b041ecf087e924790d6e8993e (patch) | |
| tree | 08a23c76939ed6879e5e80f6e06aec85b817a3b2 /bin | |
| parent | Fix the long-standing bug that object permissions set in inventory were lost (diff) | |
| parent | Remove parcel_owner_is_god option. It is conceptually wrong and with (diff) | |
| download | opensim-SC-8ab7e047bf50954b041ecf087e924790d6e8993e.zip opensim-SC-8ab7e047bf50954b041ecf087e924790d6e8993e.tar.gz opensim-SC-8ab7e047bf50954b041ecf087e924790d6e8993e.tar.bz2 opensim-SC-8ab7e047bf50954b041ecf087e924790d6e8993e.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
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 51b0d3b..f70f7db 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -472,10 +472,6 @@ | |||
| 472 | ; Allow region managers to assume god powers in regions they manage | 472 | ; Allow region managers to assume god powers in regions they manage |
| 473 | ;region_manager_is_god = false | 473 | ;region_manager_is_god = false |
| 474 | 474 | ||
| 475 | ; Allow parcel owners to assume god powers in their parcels | ||
| 476 | ; you really do not want this... | ||
| 477 | ;parcel_owner_is_god = false | ||
| 478 | |||
| 479 | ; God mode should be turned on in the viewer whenever | 475 | ; God mode should be turned on in the viewer whenever |
| 480 | ; the user has god rights somewhere. They may choose | 476 | ; the user has god rights somewhere. They may choose |
| 481 | ; to turn it off again, though. | 477 | ; to turn it off again, though. |