diff options
| author | Justin Clark-Casey (justincc) | 2011-10-12 19:24:03 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-12 19:24:03 +0100 |
| commit | 36e73dbc9b7fb46885865f5537c43a29239fd559 (patch) | |
| tree | 4e9221a18dead97483f0d8e0da2b40864d342b6d /bin | |
| parent | Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection (diff) | |
| parent | Make it possible to disable the HG linker. On non-HG systems it spits yellow (diff) | |
| download | opensim-SC_OLD-36e73dbc9b7fb46885865f5537c43a29239fd559.zip opensim-SC_OLD-36e73dbc9b7fb46885865f5537c43a29239fd559.tar.gz opensim-SC_OLD-36e73dbc9b7fb46885865f5537c43a29239fd559.tar.bz2 opensim-SC_OLD-36e73dbc9b7fb46885865f5537c43a29239fd559.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 | ||||
| -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 |
4 files changed, 4 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 9cedd98..9685467 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1377,7 +1377,7 @@ | |||
| 1377 | GroupsCacheTimeout = 30 | 1377 | GroupsCacheTimeout = 30 |
| 1378 | 1378 | ||
| 1379 | ; Specify which messaging module to use for groups messaging and if it's enabled | 1379 | ; Specify which messaging module to use for groups messaging and if it's enabled |
| 1380 | ;MessagingModule = GroupsMessagingModule | 1380 | MessagingModule = GroupsMessagingModule |
| 1381 | ;MessagingEnabled = true | 1381 | ;MessagingEnabled = true |
| 1382 | 1382 | ||
| 1383 | ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend | 1383 | ; Service connectors to the Groups Service. Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend |
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 |