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/config-include/StandaloneHypergrid.ini | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'bin/config-include/StandaloneHypergrid.ini')
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 76d588c..195e780 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -152,7 +152,13 @@ | |||
| 152 | ;; This greatly restricts the inventory operations while in other grids | 152 | ;; This greatly restricts the inventory operations while in other grids |
| 153 | [HGInventoryService] | 153 | [HGInventoryService] |
| 154 | ; For the InventoryServiceInConnector | 154 | ; For the InventoryServiceInConnector |
| 155 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | 155 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGSuitcaseInventoryService" |
| 156 | ;; alternatives: | ||
| 157 | ;; HG1.5, more permissive, not recommended, but still supported | ||
| 158 | ;LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService" | ||
| 159 | ;; HG1.0, totally permissive, not recommended, but OK for grids with 100% trust | ||
| 160 | ;LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService" | ||
| 161 | |||
| 156 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" | 162 | UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" |
| 157 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 163 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
| 158 | 164 | ||