Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 10 insertions, 4 deletions

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e368249..4195bce 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -58,6 +58,12 @@
     ;
     InventoryServerURI = "http://mygridserver.com:8003"
 
+[GridInfo]
+   ;
+   ; Change this to your grid info service
+   ;
+   GridInfoURI = "http://mygridserver.com:8002"
+
 [GridService]
     ;
     ; Change this to your grid-wide grid server
@@ -123,7 +129,7 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    ProfileServerURI = "http://mygridserver.com:8002/user"
+    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.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 84611ec..2f39218 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -48,13 +48,13 @@
     AssetLoaderArgs = "assets/AssetSets.xml"
 
 [HGInventoryService]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
 
 [HGInventoryAccessModule]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
         Gatekeeper = "http://127.0.0.1:9000"
 
     ;; If you want to protect your assets from being copied by foreign visitors