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/OpenSimDefaults.ini | |
| 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 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index c525a6e..6539f6e 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -473,7 +473,7 @@ | |||
| 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 | 475 | ; Allow parcel owners to assume god powers in their parcels |
| 476 | ; you really may not want this... | 476 | ; you really do not want this... |
| 477 | ;parcel_owner_is_god = false | 477 | ;parcel_owner_is_god = false |
| 478 | 478 | ||
| 479 | ; Control user types that are allowed to create new scripts | 479 | ; Control user types that are allowed to create new scripts |