Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2 files changed, 2 insertions, 2 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 668fabc..ab5880d 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -251,7 +251,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     SRV_HomeURI = "http://127.0.0.1:8002"
     SRV_InventoryServerURI = "http://127.0.0.1:8002"
     SRV_AssetServerURI = "http://127.0.0.1:8002"
-    SRV_ProfileServerURI = "http://127.0.0.1:8002/user"
+    SRV_ProfileServerURI = "http://127.0.0.1:8002"
     SRV_FriendsServerURI = "http://127.0.0.1:8002"
     SRV_IMServerURI = "http://127.0.0.1:8002"
 
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index d70c8e4..4195bce 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -129,7 +129,7 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    HomeURI = "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.