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/config-include/SimianGrid.ini | |
parent | Implement SendPlacesReply (diff) | |
parent | Implement SendPlacesReply (diff) | |
download | opensim-SC_OLD-3b50066ceb620ec00c50e3ea52be398e9914afdc.zip opensim-SC_OLD-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.gz opensim-SC_OLD-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.bz2 opensim-SC_OLD-3b50066ceb620ec00c50e3ea52be398e9914afdc.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/config-include/SimianGrid.ini')
-rw-r--r-- | bin/config-include/SimianGrid.ini | 3 |
1 files changed, 2 insertions, 1 deletions
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" |