aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorMelanie2009-09-30 11:17:27 +0100
committerMelanie2009-09-30 11:17:27 +0100
commit377a8b5229ba6053392f05eeaf24a7c4e46a8a9f (patch)
treebfb4c31b0ca6a47049064164ccc585d2c7992407 /bin/config-include
parentChange command help text to show .ini in place of .xml when creating regions (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-377a8b5229ba6053392f05eeaf24a7c4e46a8a9f.zip
opensim-SC_OLD-377a8b5229ba6053392f05eeaf24a7c4e46a8a9f.tar.gz
opensim-SC_OLD-377a8b5229ba6053392f05eeaf24a7c4e46a8a9f.tar.bz2
opensim-SC_OLD-377a8b5229ba6053392f05eeaf24a7c4e46a8a9f.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/config-include')
-rw-r--r--bin/config-include/GridHypergrid.ini3
-rw-r--r--bin/config-include/StandaloneHypergrid.ini3
2 files changed, 6 insertions, 0 deletions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 1bfcf89..f5aa603 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -7,6 +7,9 @@
7[Includes] 7[Includes]
8 Include-Common = "config-include/GridCommon.ini" 8 Include-Common = "config-include/GridCommon.ini"
9 9
10[Startup]
11 hypergrid = true
12
10[Modules] 13[Modules]
11 AssetServices = "HGAssetBroker" 14 AssetServices = "HGAssetBroker"
12 InventoryServices = "HGInventoryBroker" 15 InventoryServices = "HGInventoryBroker"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 75cdad9..baff811 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -7,6 +7,9 @@
7[Includes] 7[Includes]
8 Include-Common = "config-include/StandaloneCommon.ini" 8 Include-Common = "config-include/StandaloneCommon.ini"
9 9
10[Startup]
11 hypergrid = true
12
10[Modules] 13[Modules]
11 AssetServices = "HGAssetBroker" 14 AssetServices = "HGAssetBroker"
12 InventoryServices = "HGInventoryBroker" 15 InventoryServices = "HGInventoryBroker"