aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/Robust.HG.ini.example
diff options
context:
space:
mode:
authorMelanie2013-05-11 02:35:26 +0100
committerMelanie2013-05-11 02:35:26 +0100
commit13cd8c17d781c517e083cdf9d5cc3b1b95802c2d (patch)
tree41e9d608cc0fbb486ae885d4c9e9a6ad85e39ff3 /bin/Robust.HG.ini.example
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.zip
opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.gz
opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.bz2
opensim-SC_OLD-13cd8c17d781c517e083cdf9d5cc3b1b95802c2d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
-rw-r--r--bin/Robust.HG.ini.example6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index fee2a87..bc2b4cf 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -325,6 +325,12 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
325 ; For V2/V3 webapp authentication SSO 325 ; For V2/V3 webapp authentication SSO
326 ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" 326 ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
327 327
328 ; For V3 destination guide
329 ; DestinationGuide = "http://127.0.0.1/guide"
330
331 ; For V3 avatar picker (( work in progress ))
332 ; AvatarPicker = "http://127.0.0.1/avatars"
333
328 ; If you run this login server behind a proxy, set this to true 334 ; If you run this login server behind a proxy, set this to true
329 ; HasProxy = false 335 ; HasProxy = false
330 336