diff options
| author | Justin Clark-Casey (justincc) | 2012-06-19 01:55:31 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-19 01:55:31 +0100 |
| commit | bc06f3dcaf71de9179870825a20b156019321f50 (patch) | |
| tree | 57edc63f682feaf0a58b5c25366dd4f4fdc34fdd | |
| parent | minor: Add a little more detail to IOException logging in XEngine.SetXMLState() (diff) | |
| parent | Oops! putting back the entry for map urls (diff) | |
| download | opensim-SC_OLD-bc06f3dcaf71de9179870825a20b156019321f50.zip opensim-SC_OLD-bc06f3dcaf71de9179870825a20b156019321f50.tar.gz opensim-SC_OLD-bc06f3dcaf71de9179870825a20b156019321f50.tar.bz2 opensim-SC_OLD-bc06f3dcaf71de9179870825a20b156019321f50.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
| -rw-r--r-- | bin/Robust.HG.ini.example | 13 | ||||
| -rw-r--r-- | bin/Robust.ini.example | 10 |
2 files changed, 17 insertions, 6 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 9887ab5..3eecdd9 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -237,12 +237,19 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 237 | 237 | ||
| 238 | WelcomeMessage = "Welcome, Avatar!" | 238 | WelcomeMessage = "Welcome, Avatar!" |
| 239 | AllowRemoteSetLoginLevel = "false" | 239 | AllowRemoteSetLoginLevel = "false" |
| 240 | 240 | ||
| 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) | 244 | ; For V2/3 Web Profiles |
| 245 | ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" | 245 | ; Work in progress: The ProfileServerURL/OpenIDServerURL are |
| 246 | ; being used in a development viewer as support for webprofiles | ||
| 247 | ; is being developed across the componets | ||
| 248 | ; | ||
| 249 | ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" | ||
| 250 | ; | ||
| 251 | ; For V2/V3 webapp authentication SSO | ||
| 252 | ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" | ||
| 246 | 253 | ||
| 247 | ; If you run this login server behind a proxy, set this to true | 254 | ; If you run this login server behind a proxy, set this to true |
| 248 | ; HasProxy = false | 255 | ; HasProxy = false |
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index f70d13b..5a9d613 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
| @@ -225,10 +225,14 @@ 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 | ; Work in progress: The ProfileServerURL/OpenIDServerURL are |
| 229 | 229 | ; being used in a development viewer as support for webprofiles | |
| 230 | ; is being developed across the componets | ||
| 231 | ; | ||
| 232 | ; ProfileServerURL = "http://127.0.0.1/profiles/[AGENT_NAME]" | ||
| 233 | ; | ||
| 230 | ; For V2/V3 webapp authentication SSO | 234 | ; For V2/V3 webapp authentication SSO |
| 231 | OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" | 235 | ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/" |
| 232 | 236 | ||
| 233 | ; If you run this login server behind a proxy, set this to true | 237 | ; If you run this login server behind a proxy, set this to true |
| 234 | ; HasProxy = false | 238 | ; HasProxy = false |