aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2012-12-07 16:56:03 -0500
committerBlueWall2012-12-07 16:56:03 -0500
commitcba1390ffddbf4f95178e73e2f841c885e3ceee0 (patch)
tree958b6fee9f9957b477f411ed5fc7a8fba302f218
parentMerge branch 'master' into connector_plugin (diff)
parentAdded missing config var in grided sims. (diff)
downloadopensim-SC_OLD-cba1390ffddbf4f95178e73e2f841c885e3ceee0.zip
opensim-SC_OLD-cba1390ffddbf4f95178e73e2f841c885e3ceee0.tar.gz
opensim-SC_OLD-cba1390ffddbf4f95178e73e2f841c885e3ceee0.tar.bz2
opensim-SC_OLD-cba1390ffddbf4f95178e73e2f841c885e3ceee0.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--bin/config-include/GridCommon.ini.example5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 79f7ed6..e53fcca 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,11 @@
137 ;; uncomment the next line. You may want to do this on sims that have licensed content. 137 ;; uncomment the next line. You may want to do this on sims that have licensed content.
138 ; OutboundPermission = False 138 ; OutboundPermission = False
139 139
140 ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
141 ;; and available when they return. True by default.
142 ;RestrictInventoryAccessAbroad = True
143
144
140[HGAssetService] 145[HGAssetService]
141 ; 146 ;
142 ; === HG ONLY === 147 ; === HG ONLY ===