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

0.7.4.1
Justin Clark-Casey (justincc) 2012-03-22 01:56:07 +00:00
commit a8c87bab64
1 changed files with 2 additions and 2 deletions

View File

@ -225,10 +225,10 @@ 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] 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