diff options
| author | Melanie | 2010-01-28 14:38:46 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-28 14:38:46 +0000 |
| commit | 5b9ca6e35f97a098dd36a33ae8b2048927b72640 (patch) | |
| tree | 45f8d21d802a027f768c191404051ffad77d548e /bin | |
| parent | Fixes terrain editing. Changes ThrottleOutPacketType to task instead of land. (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-5b9ca6e35f97a098dd36a33ae8b2048927b72640.zip opensim-SC_OLD-5b9ca6e35f97a098dd36a33ae8b2048927b72640.tar.gz opensim-SC_OLD-5b9ca6e35f97a098dd36a33ae8b2048927b72640.tar.bz2 opensim-SC_OLD-5b9ca6e35f97a098dd36a33ae8b2048927b72640.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
| -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 23004a4..3524585 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -207,6 +207,7 @@ | |||
| 207 | ; This allows somne control over permissions | 207 | ; This allows somne control over permissions |
| 208 | ; please note that this still doesn't duplicate SL, and is not intended to | 208 | ; please note that this still doesn't duplicate SL, and is not intended to |
| 209 | ;region_owner_is_god = true | 209 | ;region_owner_is_god = true |
| 210 | ;region_manager_is_god = false | ||
| 210 | ;parcel_owner_is_god = true | 211 | ;parcel_owner_is_god = true |
| 211 | 212 | ||
| 212 | ; Control user types that are allowed to create new scripts | 213 | ; Control user types that are allowed to create new scripts |