Merge branch 'master' into 0.8-post-fixes

1 files changed, 10 insertions, 2 deletions

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 5460c0a..59eebd8 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -160,13 +160,21 @@
     HomeURI = "http://mygridserver.com:8002"
     Gatekeeper = "http://mygridserver.com:8002"
     ;; If you want to protect your assets from being copied by foreign visitors
-    ;; uncomment the next line. You may want to do this on sims that have licensed content.
-    ; OutboundPermission = False
+    ;; set this to false. You may want to do this on sims that have licensed content.
+        ;; Default is true.
+    ; OutboundPermission = True
 
     ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
     ;; and available when they return. True by default.
     ;RestrictInventoryAccessAbroad = True
 
+        ;; Warning: advanced and unusual. Default is false.
+        ;; Enables configurations where grids share user services, including inventory,
+        ;; while separating regions' assets from users' assets. Asset transfer between 
+        ;; the users' asset server and the regions' asset server is done in HG-like manner.
+    ; CheckSeparateAssets = false
+    ; RegionHGAssetServerURI = http://mygridserver.com:8002
+
 
 [HGAssetService]
     ;