diff options
author | Melanie | 2012-03-04 16:23:19 +0000 |
---|---|---|
committer | Melanie | 2012-03-04 16:23:19 +0000 |
commit | 6338996f87ca1314c493709d42b1c606f5688676 (patch) | |
tree | 5ea7bd2c640390c19ef787360d71ac97851db43f /bin/Robust.HG.ini.example | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add WebProfiles config to other config example (diff) | |
download | opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.zip opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.gz opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.bz2 opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
Diffstat (limited to '')
-rw-r--r-- | bin/Robust.HG.ini.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index ab5880d..db9f08b 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -241,6 +241,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
241 | ; For V2 map | 241 | ; For V2 map |
242 | MapTileURL = "http://127.0.0.1:8002"; | 242 | MapTileURL = "http://127.0.0.1:8002"; |
243 | 243 | ||
244 | ; For WebProfiles (V3) | ||
245 | ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" | ||
246 | |||
244 | ; If you run this login server behind a proxy, set this to true | 247 | ; If you run this login server behind a proxy, set this to true |
245 | ; HasProxy = false | 248 | ; HasProxy = false |
246 | 249 | ||