aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2009-10-12 15:25:42 +0100
committerMelanie2009-10-12 15:25:42 +0100
commit170d2c4660028570902ffe67e162d88f37957580 (patch)
tree2fdcd9f8534f397d54d592b06893b4fb6784b350 /bin/config-include
parentMerge branch 'master' into htb-throttle (diff)
parentOptimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE e... (diff)
downloadopensim-SC-170d2c4660028570902ffe67e162d88f37957580.zip
opensim-SC-170d2c4660028570902ffe67e162d88f37957580.tar.gz
opensim-SC-170d2c4660028570902ffe67e162d88f37957580.tar.bz2
opensim-SC-170d2c4660028570902ffe67e162d88f37957580.tar.xz
Merge branch 'master' into htb-throttle
Diffstat (limited to '')
-rw-r--r--bin/config-include/Grid.ini1
-rw-r--r--bin/config-include/GridHypergrid.ini1
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"