aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-22 01:56:07 +0000
committerJustin Clark-Casey (justincc)2012-03-22 01:56:07 +0000
commita8c87bab6436fe3f7983ed7a2587718b1b652e9b (patch)
tree4400b38f11e37fbab0cad9540f0d03ad05840bac
parentrefactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a8c87bab6436fe3f7983ed7a2587718b1b652e9b.zip
opensim-SC_OLD-a8c87bab6436fe3f7983ed7a2587718b1b652e9b.tar.gz
opensim-SC_OLD-a8c87bab6436fe3f7983ed7a2587718b1b652e9b.tar.bz2
opensim-SC_OLD-a8c87bab6436fe3f7983ed7a2587718b1b652e9b.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/Robust.ini.example4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 326caeb..69e94a5 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -225,10 +225,10 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
225 MapTileURL = "http://127.0.0.1:8002"; 225 MapTileURL = "http://127.0.0.1:8002";
226 226
227 ; For V2/3 Web Profiles 227 ; For V2/3 Web Profiles
228 ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME] 228 ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]"
229 229
230 ; For V2/V3 webapp authentication SSO 230 ; For V2/V3 webapp authentication SSO
231 OpenIDServerURL = "http://127.0.0.1/openid/openidserver/ 231 OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
232 232
233 ; If you run this login server behind a proxy, set this to true 233 ; If you run this login server behind a proxy, set this to true
234 ; HasProxy = false 234 ; HasProxy = false