aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include/HyperSimianGrid.ini
diff options
context:
space:
mode:
authorMelanie2010-09-13 16:16:40 +0100
committerMelanie2010-09-13 16:17:38 +0100
commit6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e (patch)
tree1e7bf4fddcf559886c6b2babf13cf4b2ca8829a1 /bin/config-include/HyperSimianGrid.ini
parentMerge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff)
parentFix unit test SceneSetupHelpers to load the mock simulation data store (diff)
downloadopensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.zip
opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.gz
opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.bz2
opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.xz
Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
Diffstat (limited to '')
-rw-r--r--bin/config-include/HyperSimianGrid.ini18
1 files changed, 12 insertions, 6 deletions
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 87ffe69..29b51de 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,13 +21,13 @@
21 Include-Common = "config-include/GridCommon.ini" 21 Include-Common = "config-include/GridCommon.ini"
22 22
23[Modules] 23[Modules]
24 GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" 24 GridServices = "SimianGridServiceConnector"
25 PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector" 25 PresenceServices = "SimianPresenceServiceConnector"
26 UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector" 26 UserAccountServices = "SimianUserAccountServiceConnector"
27 AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector" 27 AuthenticationServices = "SimianAuthenticationServiceConnector"
28 AssetServices = "HGAssetBroker" 28 AssetServices = "HGAssetBroker"
29 InventoryServices = "HGInventoryBroker" 29 InventoryServices = "HGInventoryBroker"
30 AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector" 30 AvatarServices = "SimianAvatarServiceConnector"
31 31
32 NeighbourServices = "RemoteNeighbourServicesConnector" 32 NeighbourServices = "RemoteNeighbourServicesConnector"
33 SimulationServices = "RemoteSimulationConnectorModule" 33 SimulationServices = "RemoteSimulationConnectorModule"
@@ -41,6 +41,12 @@
41 41
42 AssetCaching = "FlotsamAssetCache" 42 AssetCaching = "FlotsamAssetCache"
43 43
44[SimulationDataStore]
45 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
46
47[EstateDataStore]
48 LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
49
44[Friends] 50[Friends]
45 Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector" 51 Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
46 52
@@ -74,4 +80,4 @@
74 ServicesConnectorModule = SimianGroupsServicesConnector 80 ServicesConnectorModule = SimianGroupsServicesConnector
75 81
76[Profiles] 82[Profiles]
77 Module = SimianProfiles 83 Module = "SimianProfiles"