diff options
author | Melanie | 2012-04-08 02:25:48 +0100 |
---|---|---|
committer | Melanie | 2012-04-08 02:25:48 +0100 |
commit | a25d12d1664851099e3604a188e90337c2ba5370 (patch) | |
tree | 24755156ec3022ef000f389177721ca85d6d93bd /bin | |
parent | Merge branch 'master' into careminster (diff) | |
parent | A few more minor improvements on Suitcase inventory service. (diff) | |
download | opensim-SC_OLD-a25d12d1664851099e3604a188e90337c2ba5370.zip opensim-SC_OLD-a25d12d1664851099e3604a188e90337c2ba5370.tar.gz opensim-SC_OLD-a25d12d1664851099e3604a188e90337c2ba5370.tar.bz2 opensim-SC_OLD-a25d12d1664851099e3604a188e90337c2ba5370.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'bin')
-rw-r--r-- | bin/Robust.HG.ini.example | 8 | ||||
-rw-r--r-- | bin/config-include/StandaloneCommon.ini.example | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 2fd9f11..0eb8291 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -318,6 +318,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
318 | 318 | ||
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 | |||
322 | ; HG address of the gatekeeper, if you have one | ||
323 | ; this is the entry point for all the regions of the world | ||
324 | ; gatekeeper = http://127.0.0.1:8002/ | ||
325 | |||
326 | ; HG user domain, if you have one | ||
327 | ; this is the entry point for all user-related HG services | ||
328 | ; uas = http://127.0.0.1:8002/ | ||
321 | 329 | ||
322 | [GatekeeperService] | 330 | [GatekeeperService] |
323 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" | 331 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 8d9842c..4f4f400 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -231,6 +231,14 @@ | |||
231 | ; currently unused | 231 | ; currently unused |
232 | ;password = http://127.0.0.1/password | 232 | ;password = http://127.0.0.1/password |
233 | 233 | ||
234 | ; HG address of the gatekeeper, if you have one | ||
235 | ; this is the entry point for all the regions of the world | ||
236 | ; gatekeeper = http://127.0.0.1:9000/ | ||
237 | |||
238 | ; HG user domain, if you have one | ||
239 | ; this is the entry point for all user-related HG services | ||
240 | ; uas = http://127.0.0.1:9000/ | ||
241 | |||
234 | [MapImageService] | 242 | [MapImageService] |
235 | ; Set this if you want to change the default | 243 | ; Set this if you want to change the default |
236 | ; TilesStoragePath = "maptiles" | 244 | ; TilesStoragePath = "maptiles" |