diff options
author | UbitUmarov | 2017-05-31 07:21:21 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-31 07:21:21 +0100 |
commit | 55babdc16090397499081f0428500babe383ff3a (patch) | |
tree | efb2f7ec13abba489d6318ebace8a86c6cde66c6 /bin/config-include/SimianGrid.ini | |
parent | disable llhttprequests secure con, since it still collides with main ssl sett... (diff) | |
parent | we don't need to keep refs to baked textures assets (diff) | |
download | opensim-SC-55babdc16090397499081f0428500babe383ff3a.zip opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.gz opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.bz2 opensim-SC-55babdc16090397499081f0428500babe383ff3a.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'bin/config-include/SimianGrid.ini')
-rw-r--r-- | bin/config-include/SimianGrid.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini index 5749656..b3db08a 100644 --- a/bin/config-include/SimianGrid.ini +++ b/bin/config-include/SimianGrid.ini | |||
@@ -29,7 +29,7 @@ | |||
29 | InventoryServices = "SimianInventoryServiceConnector" | 29 | InventoryServices = "SimianInventoryServiceConnector" |
30 | AvatarServices = "SimianAvatarServiceConnector" | 30 | AvatarServices = "SimianAvatarServiceConnector" |
31 | 31 | ||
32 | NeighbourServices = "RemoteNeighbourServicesConnector" | 32 | NeighbourServices = "NeighbourServicesOutConnector" |
33 | SimulationServices = "RemoteSimulationConnectorModule" | 33 | SimulationServices = "RemoteSimulationConnectorModule" |
34 | EntityTransferModule = "BasicEntityTransferModule" | 34 | EntityTransferModule = "BasicEntityTransferModule" |
35 | InventoryAccessModule = "BasicInventoryAccessModule" | 35 | InventoryAccessModule = "BasicInventoryAccessModule" |