diff options
| author | Justin Clark-Casey (justincc) | 2010-09-21 01:01:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-21 01:01:07 +0100 |
| commit | 192bcab98711245e241f1b37cb12cc29a26b168e (patch) | |
| tree | 6e72ef2c0b7d20355f29119a603877786d83bf37 /bin | |
| parent | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ... (diff) | |
| parent | * Tweaked the LocationTests for maximum coverage. (diff) | |
| download | opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.zip opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.gz opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.bz2 opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/config-include/Grid.ini | 1 | ||||
| -rw-r--r-- | bin/config-include/GridHypergrid.ini | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 1794573..5624a38 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | SimulationServices = "RemoteSimulationConnectorModule" | 20 | SimulationServices = "RemoteSimulationConnectorModule" |
| 21 | EntityTransferModule = "BasicEntityTransferModule" | 21 | EntityTransferModule = "BasicEntityTransferModule" |
| 22 | InventoryAccessModule = "BasicInventoryAccessModule" | 22 | InventoryAccessModule = "BasicInventoryAccessModule" |
| 23 | LandServices = "RemoteLandServicesConnector" | ||
| 23 | 24 | ||
| 24 | LandServiceInConnector = true | 25 | LandServiceInConnector = true |
| 25 | NeighbourServiceInConnector = true | 26 | NeighbourServiceInConnector = true |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index cb9ead4..409b2a9 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | SimulationServices = "RemoteSimulationConnectorModule" | 23 | SimulationServices = "RemoteSimulationConnectorModule" |
| 24 | EntityTransferModule = "HGEntityTransferModule" | 24 | EntityTransferModule = "HGEntityTransferModule" |
| 25 | InventoryAccessModule = "HGInventoryAccessModule" | 25 | InventoryAccessModule = "HGInventoryAccessModule" |
| 26 | LandServices = "RemoteLandServicesConnector" | ||
| 26 | 27 | ||
| 27 | LandServiceInConnector = true | 28 | LandServiceInConnector = true |
| 28 | NeighbourServiceInConnector = true | 29 | NeighbourServiceInConnector = true |