diff options
author | Melanie | 2010-07-08 17:32:57 +0100 |
---|---|---|
committer | Melanie | 2010-07-08 17:32:57 +0100 |
commit | 5f400a50beb2b9d523e5a0fac643ca1cb247c9a6 (patch) | |
tree | da874e34ef1c790f9b8ce9dc0533ac98755d783c /bin | |
parent | minimizes temp garbage for llParseStringKeepNulls() (diff) | |
parent | llVecNorm() now returns a zero-length vector when one is supplied as input. A... (diff) | |
download | opensim-SC_OLD-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.zip opensim-SC_OLD-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.gz opensim-SC_OLD-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.bz2 opensim-SC_OLD-5f400a50beb2b9d523e5a0fac643ca1cb247c9a6.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 3 | ||||
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 1adc2d8..ab29018 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 | WorldMapModule = "HGWorldMap" | ||
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 52e30e2..e87270d 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -3,7 +3,10 @@ | |||
3 | ;; All optional settings are in StandaloneCommon.ini.example, | 3 | ;; All optional settings are in StandaloneCommon.ini.example, |
4 | ;; which you can copy and change. | 4 | ;; which you can copy and change. |
5 | ;; | 5 | ;; |
6 | 6 | ||
7 | [Startup] | ||
8 | WorldMapModule = "HGWorldMap" | ||
9 | |||
7 | [Modules] | 10 | [Modules] |
8 | AssetServices = "HGAssetBroker" | 11 | AssetServices = "HGAssetBroker" |
9 | InventoryServices = "HGInventoryBroker" | 12 | InventoryServices = "HGInventoryBroker" |