diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /bin/Robust.HG.ini.example | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'bin/Robust.HG.ini.example')
| -rw-r--r-- | bin/Robust.HG.ini.example | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index e8d6846..55b6f90 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
| @@ -497,8 +497,15 @@ ConfigDirectory = "/home/opensim/etc/Configs" | |||
| 497 | ; * | 497 | ; * |
| 498 | [HGInventoryService] | 498 | [HGInventoryService] |
| 499 | ; For the InventoryServiceInConnector | 499 | ; For the InventoryServiceInConnector |
| 500 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | 500 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService" |
| 501 | ;; alternatives: | ||
| 502 | ;; HG1.5, more permissive, not recommended, but still supported | ||
| 503 | ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | ||
| 504 | ;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust | ||
| 505 | ;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" | ||
| 506 | |||
| 501 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 507 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
| 508 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | ||
| 502 | HomeURI = "http://127.0.0.1:8002" | 509 | HomeURI = "http://127.0.0.1:8002" |
| 503 | 510 | ||
| 504 | ; * The interface that local users get when they are in other grids. | 511 | ; * The interface that local users get when they are in other grids. |