diff options
| author | Melanie | 2012-04-11 23:35:27 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-11 23:35:27 +0100 |
| commit | 4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753 (patch) | |
| tree | 28253aa39e6bf11e8f814d6818f727e5f27eb036 /bin/Robust.HG.ini.example | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | HGFriendsModule: Type casts to fix compile error (diff) | |
| download | opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.zip opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.gz opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.bz2 opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
| -rw-r--r-- | bin/Robust.HG.ini.example | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 0eb8291..4ea5ffd 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -319,13 +319,13 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
| 319 | ; password help: optional: page providing password assistance for users of your grid | 319 | ; password help: optional: page providing password assistance for users of your grid |
| 320 | ;password = http://127.0.0.1/password | 320 | ;password = http://127.0.0.1/password |
| 321 | 321 | ||
| 322 | ; HG address of the gatekeeper, if you have one | 322 | ; HG address of the gatekeeper, if you have one |
| 323 | ; this is the entry point for all the regions of the world | 323 | ; this is the entry point for all the regions of the world |
| 324 | ; gatekeeper = http://127.0.0.1:8002/ | 324 | ; gatekeeper = http://127.0.0.1:8002/ |
| 325 | 325 | ||
| 326 | ; HG user domain, if you have one | 326 | ; HG user domain, if you have one |
| 327 | ; this is the entry point for all user-related HG services | 327 | ; this is the entry point for all user-related HG services |
| 328 | ; uas = http://127.0.0.1:8002/ | 328 | ; uas = http://127.0.0.1:8002/ |
| 329 | 329 | ||
| 330 | [GatekeeperService] | 330 | [GatekeeperService] |
| 331 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" | 331 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" |