aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2010-01-28 14:38:46 +0000
committerMelanie2010-01-28 14:38:46 +0000
commit5b9ca6e35f97a098dd36a33ae8b2048927b72640 (patch)
tree45f8d21d802a027f768c191404051ffad77d548e /bin
parentFixes terrain editing. Changes ThrottleOutPacketType to task instead of land. (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-5b9ca6e35f97a098dd36a33ae8b2048927b72640.zip
opensim-SC-5b9ca6e35f97a098dd36a33ae8b2048927b72640.tar.gz
opensim-SC-5b9ca6e35f97a098dd36a33ae8b2048927b72640.tar.bz2
opensim-SC-5b9ca6e35f97a098dd36a33ae8b2048927b72640.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example1
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