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

2 files changed, 17 insertions, 6 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 9887ab5..3eecdd9 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -237,12 +237,19 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
-    
+
     ; For V2 map
     MapTileURL = "http://127.0.0.1:8002";
 
-    ; For WebProfiles (V3)
-    ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
+    ; For V2/3 Web Profiles
+    ; Work in progress: The ProfileServerURL/OpenIDServerURL are
+    ; being used in a development viewer as support for webprofiles
+    ; is being developed across the componets
+    ;
+    ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
+    ;
+    ; For V2/V3 webapp authentication SSO
+    ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
 
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index f70d13b..5a9d613 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -225,10 +225,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     MapTileURL = "http://127.0.0.1:8002";
 
     ; For V2/3 Web Profiles
-    ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
-
+    ; Work in progress: The ProfileServerURL/OpenIDServerURL are
+    ; being used in a development viewer as support for webprofiles
+    ; is being developed across the componets
+    ;
+    ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
+    ;
     ; For V2/V3 webapp authentication SSO
-    OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
+    ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
 
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false