diff options
author | Melanie | 2013-05-11 01:29:30 +0100 |
---|---|---|
committer | Melanie | 2013-05-11 01:29:30 +0100 |
commit | 55c9bc15e571065f66190e017f973f6e1ac43428 (patch) | |
tree | 537b8c95902bf343d8aeeef52a38124e0ba7e701 /bin/Robust.ini.example | |
parent | Send up the part missing from the Avination Estate commit. (diff) | |
parent | BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie (diff) | |
download | opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.zip opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.gz opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.bz2 opensim-SC_OLD-55c9bc15e571065f66190e017f973f6e1ac43428.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin/Robust.ini.example')
-rw-r--r-- | bin/Robust.ini.example | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 2d5aa8c..1d66b7f 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -288,6 +288,12 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto | |||
288 | ; For V2/V3 webapp authentication SSO | 288 | ; For V2/V3 webapp authentication SSO |
289 | ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" | 289 | ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" |
290 | 290 | ||
291 | ; For V3 destination guide | ||
292 | ; DestinationGuide = "http://127.0.0.1/guide" | ||
293 | |||
294 | ; For V3 avatar picker (( work in progress )) | ||
295 | ; AvatarPicker = "http://127.0.0.1/avatars" | ||
296 | |||
291 | ; If you run this login server behind a proxy, set this to true | 297 | ; If you run this login server behind a proxy, set this to true |
292 | ; HasProxy = false | 298 | ; HasProxy = false |
293 | 299 | ||