diff options
| author | Melanie | 2011-10-12 16:45:48 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-12 16:45:48 +0100 |
| commit | 35def547f7b53312a280d3786b9196688d335382 (patch) | |
| tree | 81a301bbb251e8a5e4b06e37eead59f0f30cb04f /bin | |
| parent | Disable Flotsam groups messaging module in our config base (diff) | |
| parent | Make it possible to disable the HG linker. On non-HG systems it spits yellow (diff) | |
| download | opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.zip opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.gz opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.bz2 opensim-SC_OLD-35def547f7b53312a280d3786b9196688d335382.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/config-include/GridHypergrid.ini | 1 | ||||
| -rw-r--r-- | bin/config-include/HyperSimianGrid.ini | 1 | ||||
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 60a3c62..4c32498 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | LandServices = "RemoteLandServicesConnector" | 26 | LandServices = "RemoteLandServicesConnector" |
| 27 | FriendsModule = "HGFriendsModule" | 27 | FriendsModule = "HGFriendsModule" |
| 28 | MapImageService = "MapImageServiceModule" | 28 | MapImageService = "MapImageServiceModule" |
| 29 | HypergridLinker = "HypergridLinker" | ||
| 29 | 30 | ||
| 30 | LandServiceInConnector = true | 31 | LandServiceInConnector = true |
| 31 | NeighbourServiceInConnector = true | 32 | NeighbourServiceInConnector = true |
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index 89d6be7..ec4efc0 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | LibraryModule = false | 40 | LibraryModule = false |
| 41 | 41 | ||
| 42 | AssetCaching = "FlotsamAssetCache" | 42 | AssetCaching = "FlotsamAssetCache" |
| 43 | HypergridLinker = "HypergridLinker" | ||
| 43 | 44 | ||
| 44 | [SimulationDataStore] | 45 | [SimulationDataStore] |
| 45 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 46 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 719df5c..f8c258a 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | EntityTransferModule = "HGEntityTransferModule" | 22 | EntityTransferModule = "HGEntityTransferModule" |
| 23 | InventoryAccessModule = "HGInventoryAccessModule" | 23 | InventoryAccessModule = "HGInventoryAccessModule" |
| 24 | FriendsModule = "HGFriendsModule" | 24 | FriendsModule = "HGFriendsModule" |
| 25 | HypergridLinker = "HypergridLinker" | ||
| 25 | 26 | ||
| 26 | InventoryServiceInConnector = true | 27 | InventoryServiceInConnector = true |
| 27 | AssetServiceInConnector = true | 28 | AssetServiceInConnector = true |