Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.

1 files changed, 15 insertions, 10 deletions

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ffa2d49..3129078 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -64,8 +64,8 @@
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper="http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI="http://127.0.0.1:9000"
 
 [LibraryModule]
     ; Set this if you want to change the name of the OpenSim Library
@@ -73,7 +73,8 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-    GatekeeperURI = "http://127.0.0.1:9000"
+        ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
     SRV_HomeURI = "http://127.0.0.1:9000"    
     SRV_InventoryServerURI = "http://127.0.0.1:9000"
@@ -218,7 +219,8 @@
 ;; HG configurations
 ;;
 [GatekeeperService]
-    ExternalName = "http://127.0.0.1:9000"
+        ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+    ; ExternalName = "http://127.0.0.1:9000"
 
     ; Does this grid allow incoming links to any region in it?
     ; If false, HG TPs happen only to the  Default regions specified in [GridService] section
@@ -274,10 +276,12 @@
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
 [HGInventoryService]
-    HomeURI = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-    HomeURI = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
 
     ;; The asset types that this grid can export to / import from other grids.
         ;; Comma separated.
@@ -293,8 +297,9 @@
 
 
 [HGInventoryAccessModule]
-    HomeURI = "http://127.0.0.1:9000"
-        Gatekeeper = "http://127.0.0.1:9000"
+        ;; If you have these set under [Startup], no need to set it here, leave it commented
+    ; HomeURI = "http://127.0.0.1:9000"
+        ; GatekeeperURI = "http://127.0.0.1:9000"
 
     ;; 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.
@@ -311,8 +316,8 @@
 
 [Messaging]
     ; === HG ONLY ===
-    ;; change this to the address of your simulator
-    Gatekeeper = "http://127.0.0.1:9000"
+        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:9000"
 
 
 [EntityTransfer]