diff options
author | Melanie | 2010-12-30 01:40:38 +0000 |
---|---|---|
committer | Melanie | 2010-12-30 01:40:38 +0000 |
commit | 3b50066ceb620ec00c50e3ea52be398e9914afdc (patch) | |
tree | af41bb529e93a0d2cf5e2ee002f0231d300c0d16 /bin | |
parent | Implement SendPlacesReply (diff) | |
parent | Implement SendPlacesReply (diff) | |
download | opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.zip opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.gz opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.bz2 opensim-SC-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | bin/config-include/Grid.ini | 2 | ||||
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 2 | ||||
-rw-r--r-- | bin/config-include/HyperSimianGrid.ini | 5 | ||||
-rw-r--r-- | bin/config-include/SimianGrid.ini | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 5624a38..ce5588e 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
@@ -37,6 +37,8 @@ | |||
37 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 37 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
38 | ; for the LocalGridServicesConnector which is used by the Remote one | 38 | ; for the LocalGridServicesConnector which is used by the Remote one |
39 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 39 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
40 | |||
41 | NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector" | ||
40 | 42 | ||
41 | [LibraryService] | 43 | [LibraryService] |
42 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 44 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index e983755..5142d90 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -49,6 +49,8 @@ | |||
49 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 49 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
50 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 50 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
51 | 51 | ||
52 | NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector" | ||
53 | |||
52 | ; Needed to display non-default map tile images for linked regions | 54 | ; Needed to display non-default map tile images for linked regions |
53 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" | 55 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" |
54 | 56 | ||
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 29b51de..0b01116 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini | |||
@@ -21,7 +21,7 @@ | |||
21 | Include-Common = "config-include/GridCommon.ini" | 21 | Include-Common = "config-include/GridCommon.ini" |
22 | 22 | ||
23 | [Modules] | 23 | [Modules] |
24 | GridServices = "SimianGridServiceConnector" | 24 | GridServices = "RemoteGridServicesConnector" |
25 | PresenceServices = "SimianPresenceServiceConnector" | 25 | PresenceServices = "SimianPresenceServiceConnector" |
26 | UserAccountServices = "SimianUserAccountServiceConnector" | 26 | UserAccountServices = "SimianUserAccountServiceConnector" |
27 | AuthenticationServices = "SimianAuthenticationServiceConnector" | 27 | AuthenticationServices = "SimianAuthenticationServiceConnector" |
@@ -53,7 +53,8 @@ | |||
53 | [GridService] | 53 | [GridService] |
54 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 54 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
55 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 55 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
56 | 56 | NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" | |
57 | |||
57 | AllowHypergridMapSearch = true | 58 | AllowHypergridMapSearch = true |
58 | 59 | ||
59 | [LibraryService] | 60 | [LibraryService] |
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini index 239ce30..311a55b 100644 --- a/bin/config-include/SimianGrid.ini +++ b/bin/config-include/SimianGrid.ini | |||
@@ -21,7 +21,7 @@ | |||
21 | Include-Common = "config-include/GridCommon.ini" | 21 | Include-Common = "config-include/GridCommon.ini" |
22 | 22 | ||
23 | [Modules] | 23 | [Modules] |
24 | GridServices = "SimianGridServiceConnector" | 24 | GridServices = "RemoteGridServicesConnector" |
25 | PresenceServices = "SimianPresenceServiceConnector" | 25 | PresenceServices = "SimianPresenceServiceConnector" |
26 | UserAccountServices = "SimianUserAccountServiceConnector" | 26 | UserAccountServices = "SimianUserAccountServiceConnector" |
27 | AuthenticationServices = "SimianAuthenticationServiceConnector" | 27 | AuthenticationServices = "SimianAuthenticationServiceConnector" |
@@ -53,6 +53,7 @@ | |||
53 | [GridService] | 53 | [GridService] |
54 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 54 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
55 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 55 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
56 | NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" | ||
56 | 57 | ||
57 | [LibraryService] | 58 | [LibraryService] |
58 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" | 59 | LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService" |