diff options
| author | Melanie | 2010-02-08 15:53:20 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-08 15:53:38 +0000 |
| commit | baaf660511214e52ea4ed20b8e80ec8e1ff06a3a (patch) | |
| tree | 1e90c7a22ea3354d6bfd5d2b3f8f64f199dbd477 /bin/OpenSim.ini.example | |
| parent | Added missing configs to Standalone.ini (diff) | |
| parent | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff) | |
| download | opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.zip opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.gz opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.bz2 opensim-SC_OLD-baaf660511214e52ea4ed20b8e80ec8e1ff06a3a.tar.xz | |
Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 6cb3f02..dd487b7 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -191,6 +191,7 @@ | |||
| 191 | ; This allows somne control over permissions | 191 | ; This allows somne control over permissions |
| 192 | ; please note that this still doesn't duplicate SL, and is not intended to | 192 | ; please note that this still doesn't duplicate SL, and is not intended to |
| 193 | ;region_owner_is_god = true | 193 | ;region_owner_is_god = true |
| 194 | ;region_manager_is_god = false | ||
| 194 | ;parcel_owner_is_god = true | 195 | ;parcel_owner_is_god = true |
| 195 | 196 | ||
| 196 | ; Control user types that are allowed to create new scripts | 197 | ; Control user types that are allowed to create new scripts |