diff options
| author | Dan Lake | 2012-01-03 16:52:53 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-01-03 16:52:53 -0800 |
| commit | ecf9824b63d181bd4e64bd5cb0ff37b952669bb9 (patch) | |
| tree | 269207a773c6bd1fd8383885e0c5649d70b34a62 /bin/config-include | |
| parent | Access to these static methods to serialize objects are useful outside of ser... (diff) | |
| parent | Update C5.dll to version 1.1.1 from 1.1.0 (diff) | |
| download | opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.zip opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.gz opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.bz2 opensim-SC_OLD-ecf9824b63d181bd4e64bd5cb0ff37b952669bb9.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/GridHypergrid.ini | 2 | ||||
| -rw-r--r-- | bin/config-include/HyperSimianGrid.ini | 2 | ||||
| -rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 4c32498..5f0ba37 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | LandServices = "RemoteLandServicesConnector" | 26 | LandServices = "RemoteLandServicesConnector" |
| 27 | FriendsModule = "HGFriendsModule" | 27 | FriendsModule = "HGFriendsModule" |
| 28 | MapImageService = "MapImageServiceModule" | 28 | MapImageService = "MapImageServiceModule" |
| 29 | HypergridLinker = "HypergridLinker" | ||
| 30 | 29 | ||
| 31 | LandServiceInConnector = true | 30 | LandServiceInConnector = true |
| 32 | NeighbourServiceInConnector = true | 31 | NeighbourServiceInConnector = true |
| @@ -60,6 +59,7 @@ | |||
| 60 | ; Needed to display non-default map tile images for linked regions | 59 | ; Needed to display non-default map tile images for linked regions |
| 61 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" | 60 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" |
| 62 | 61 | ||
| 62 | HypergridLinker = true | ||
| 63 | AllowHypergridMapSearch = true | 63 | AllowHypergridMapSearch = true |
| 64 | 64 | ||
| 65 | [LibraryService] | 65 | [LibraryService] |
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini index ec4efc0..99a589c 100644 --- a/bin/config-include/HyperSimianGrid.ini +++ b/bin/config-include/HyperSimianGrid.ini | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | LibraryModule = false | 40 | LibraryModule = false |
| 41 | 41 | ||
| 42 | AssetCaching = "FlotsamAssetCache" | 42 | AssetCaching = "FlotsamAssetCache" |
| 43 | HypergridLinker = "HypergridLinker" | ||
| 44 | 43 | ||
| 45 | [SimulationDataStore] | 44 | [SimulationDataStore] |
| 46 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 45 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
| @@ -56,6 +55,7 @@ | |||
| 56 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" | 55 | StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" |
| 57 | NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" | 56 | NetworkConnector = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector" |
| 58 | 57 | ||
| 58 | HypergridLinker = true | ||
| 59 | AllowHypergridMapSearch = true | 59 | AllowHypergridMapSearch = true |
| 60 | 60 | ||
| 61 | [LibraryService] | 61 | [LibraryService] |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index f8c258a..00beb31 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | EntityTransferModule = "HGEntityTransferModule" | 22 | EntityTransferModule = "HGEntityTransferModule" |
| 23 | InventoryAccessModule = "HGInventoryAccessModule" | 23 | InventoryAccessModule = "HGInventoryAccessModule" |
| 24 | FriendsModule = "HGFriendsModule" | 24 | FriendsModule = "HGFriendsModule" |
| 25 | HypergridLinker = "HypergridLinker" | ||
| 26 | 25 | ||
| 27 | InventoryServiceInConnector = true | 26 | InventoryServiceInConnector = true |
| 28 | AssetServiceInConnector = true | 27 | AssetServiceInConnector = true |
| @@ -84,6 +83,7 @@ | |||
| 84 | ; Needed to display non-default map tile images for remote regions | 83 | ; Needed to display non-default map tile images for remote regions |
| 85 | AssetService = "OpenSim.Services.AssetService.dll:AssetService" | 84 | AssetService = "OpenSim.Services.AssetService.dll:AssetService" |
| 86 | 85 | ||
| 86 | HypergridLinker = true | ||
| 87 | AllowHypergridMapSearch = true | 87 | AllowHypergridMapSearch = true |
| 88 | 88 | ||
| 89 | [PresenceService] | 89 | [PresenceService] |