aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2010-06-29 20:36:36 +0100
committerMelanie2010-06-29 20:36:36 +0100
commit5d11833ae1969718187c23b9d29ebd233ecbb401 (patch)
tree3be12b67f0c1198a10c2e15afbfffa32b8a4f77f /bin/config-include
parentFix a nullref on autoreturn (diff)
parentstop exceptions in setting and getting state from propogating since they aren... (diff)
downloadopensim-SC-5d11833ae1969718187c23b9d29ebd233ecbb401.zip
opensim-SC-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.gz
opensim-SC-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.bz2
opensim-SC-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/StandaloneCommon.ini.example5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index bfa6725..de8677f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -68,3 +68,8 @@
68 68
69[GatekeeperService] 69[GatekeeperService]
70 ExternalName = "http://127.0.0.1:9000" 70 ExternalName = "http://127.0.0.1:9000"
71
72 ; Does this grid allow incoming links to any region in it?
73 ; If false, HG TPs happen only to the Default regions specified in [GridService] section
74 AllowTeleportsToAnyRegion = true
75