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

4 files changed, 9 insertions, 9 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 97102a2..f9b405d 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -171,9 +171,9 @@
     ; physics = basicphysics
     ; physics = POS
 
-    ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule
-    ;; Permission modules to use, separated by space.
-    ; permissionmodules = "DefaultPermissionsModule"
+    ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
+    ;; Permission modules to use, separated by comma.
+    ; permissionmodules = DefaultPermissionsModule
 
     ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
     ;; These are the parameters for the default permissions module
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 49ee41a..668fabc 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -380,7 +380,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; For the InventoryServiceInConnector
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
         UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-        ProfileServerURI = "http://127.0.0.1:8002/user"
+        HomeURI = "http://127.0.0.1:8002"
 
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the access that the rest of the world has to
@@ -389,7 +389,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [HGAssetService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ProfileServerURI = "http://127.0.0.1:8002/user"
+    HomeURI = "http://127.0.0.1:8002"
 
 [HGFriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e368249..815e08c 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -123,7 +123,7 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    ProfileServerURI = "http://mygridserver.com:8002/user"
+    HomeURI = "http://mygridserver.com:8002/user"
     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