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

0.7.4.1
Justin Clark-Casey (justincc) 2012-06-19 01:55:31 +01:00
commit bc06f3dcaf
2 changed files with 17 additions and 6 deletions

View File

@ -241,8 +241,15 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
; For V2 map ; For V2 map
MapTileURL = "http://127.0.0.1:8002"; MapTileURL = "http://127.0.0.1:8002";
; For WebProfiles (V3) ; 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/"
; If you run this login server behind a proxy, set this to true ; If you run this login server behind a proxy, set this to true
; HasProxy = false ; HasProxy = false

View File

@ -225,10 +225,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
MapTileURL = "http://127.0.0.1:8002"; MapTileURL = "http://127.0.0.1:8002";
; For V2/3 Web Profiles ; 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 ; 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 ; If you run this login server behind a proxy, set this to true
; HasProxy = false ; HasProxy = false