diff options
| author | Melanie | 2010-01-19 04:18:01 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-19 04:18:01 +0000 |
| commit | a3f48a7ca66347b11990e5444a636d40bec5dbf1 (patch) | |
| tree | a5708996ccf28ce8696b8257a0b33352f56e2afe /bin/config-include | |
| parent | Add a Hyperlink flag to the regions table (diff) | |
| parent | * Towards enabling hyperlinks at grid-level. (diff) | |
| download | opensim-SC_OLD-a3f48a7ca66347b11990e5444a636d40bec5dbf1.zip opensim-SC_OLD-a3f48a7ca66347b11990e5444a636d40bec5dbf1.tar.gz opensim-SC_OLD-a3f48a7ca66347b11990e5444a636d40bec5dbf1.tar.bz2 opensim-SC_OLD-a3f48a7ca66347b11990e5444a636d40bec5dbf1.tar.xz | |
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
Diffstat (limited to 'bin/config-include')
| -rw-r--r-- | bin/config-include/GridHypergrid.ini | 13 | ||||
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 3 |
2 files changed, 9 insertions, 7 deletions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 4b6bc17..4885a41 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
| @@ -17,18 +17,17 @@ | |||
| 17 | AvatarServices = "RemoteAvatarServicesConnector" | 17 | AvatarServices = "RemoteAvatarServicesConnector" |
| 18 | NeighbourServices = "RemoteNeighbourServicesConnector" | 18 | NeighbourServices = "RemoteNeighbourServicesConnector" |
| 19 | AuthenticationServices = "RemoteAuthenticationServicesConnector" | 19 | AuthenticationServices = "RemoteAuthenticationServicesConnector" |
| 20 | AuthorizationServices = "LocalAuthorizationServicesConnector" | ||
| 20 | PresenceServices = "RemotePresenceServicesConnector" | 21 | PresenceServices = "RemotePresenceServicesConnector" |
| 21 | UserAccountServices = "RemoteUserAccountServicesConnector" | 22 | UserAccountServices = "RemoteUserAccountServicesConnector" |
| 22 | SimulationServices = "RemoteSimulationConnectorModule" | 23 | SimulationServices = "RemoteSimulationConnectorModule" |
| 23 | EntityTransferModule = "BasicEntityTransferModule" | 24 | EntityTransferModule = "HGEntityTransferModule" |
| 24 | LandServiceInConnector = true | 25 | LandServiceInConnector = true |
| 25 | NeighbourServiceInConnector = true | 26 | NeighbourServiceInConnector = true |
| 26 | HypergridServiceInConnector = true | ||
| 27 | SimulationServiceInConnector = true | 27 | SimulationServiceInConnector = true |
| 28 | LibraryModule = true | 28 | LibraryModule = true |
| 29 | InventoryServiceInConnector = false | 29 | InventoryServiceInConnector = false |
| 30 | AssetServiceInConnector = false | 30 | AssetServiceInConnector = false |
| 31 | LLLoginServiceInConnector = false | ||
| 32 | 31 | ||
| 33 | [AssetService] | 32 | [AssetService] |
| 34 | LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" | 33 | LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" |
| @@ -41,12 +40,12 @@ | |||
| 41 | [GridService] | 40 | [GridService] |
| 42 | ; for the HGGridServicesConnector to instantiate | 41 | ; for the HGGridServicesConnector to instantiate |
| 43 | GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector" | 42 | GridServiceConnectorModule = "OpenSim.Region.CoreModules.dll:RemoteGridServicesConnector" |
| 43 | HypergridService = "OpenSim.Services.HypergridService.dll:HypergridService" | ||
| 44 | ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, | 44 | ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector, |
| 45 | ; which in turn uses this | 45 | ; which in turn uses this |
| 46 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 46 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
| 47 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 47 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
| 48 | 48 | ||
| 49 | [LibraryService] | 49 | [HypergridService] |
| 50 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 50 | GridService = "OpenSim.Services.GridService.dll:GridService" |
| 51 | LibraryName = "OpenSim Library" | 51 | AssetService = "OpenSim.Services.AssetService.dll:AssetService" |
| 52 | DefaultLibrary = "./inventory/Libraries.xml" | ||
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index eb887a6..28b9d47 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -82,6 +82,9 @@ | |||
| 82 | GridService = "OpenSim.Services.GridService.dll:GridService" | 82 | GridService = "OpenSim.Services.GridService.dll:GridService" |
| 83 | AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" | 83 | AuthenticationService = "OpenSim.Services.Connectors.dll:AuthenticationServicesConnector" |
| 84 | 84 | ||
| 85 | [HGEntityTransferModule] | ||
| 86 | HomeUsersSecurityService = "OpenSim.Services.HypergridService.dll:HomeUsersSecurityService" | ||
| 87 | |||
| 85 | [PresenceService] | 88 | [PresenceService] |
| 86 | LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" | 89 | LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" |
| 87 | 90 | ||