diff options
| author | Melanie | 2009-10-12 15:12:15 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-12 15:12:15 +0100 |
| commit | 70553a979e551efc47f56930282c6b01ff4277e1 (patch) | |
| tree | 347632a3f51e7eace08e383f17b7f3e5ad218610 /bin | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE e... (diff) | |
| download | opensim-SC-70553a979e551efc47f56930282c6b01ff4277e1.zip opensim-SC-70553a979e551efc47f56930282c6b01ff4277e1.tar.gz opensim-SC-70553a979e551efc47f56930282c6b01ff4277e1.tar.bz2 opensim-SC-70553a979e551efc47f56930282c6b01ff4277e1.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'bin')
| -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 261c1b8..5b19130 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | GridServices = "RemoteGridServicesConnector" | 15 | GridServices = "RemoteGridServicesConnector" |
| 16 | NeighbourServiceInConnector = true | 16 | NeighbourServiceInConnector = true |
| 17 | LandServiceInConnector = true | 17 | LandServiceInConnector = true |
| 18 | LLProxyLoginModule = true | ||
| 18 | 19 | ||
| 19 | [GridService] | 20 | [GridService] |
| 20 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" | 21 | LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" |
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index f5aa603..a5fe6e9 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | NeighbourServiceInConnector = true | 18 | NeighbourServiceInConnector = true |
| 19 | LandServiceInConnector = true | 19 | LandServiceInConnector = true |
| 20 | HypergridServiceInConnector = true | 20 | HypergridServiceInConnector = true |
| 21 | LLProxyLoginModule = true | ||
| 21 | 22 | ||
| 22 | [AssetService] | 23 | [AssetService] |
| 23 | LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" | 24 | LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" |