aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMichael Cortez2009-08-06 09:38:51 -0700
committerMichael Cortez2009-08-06 09:38:51 -0700
commit2ac04cb624d36c048b6793f9db7c073eb6a01026 (patch)
treecb76f55c634c9f1107dea7204729497c5ba3bb75 /bin
parentFixing comments re: INI file. (diff)
parentAdd the config-include statement to OpenSim.ini.example. (diff)
downloadopensim-SC-2ac04cb624d36c048b6793f9db7c073eb6a01026.zip
opensim-SC-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.gz
opensim-SC-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.bz2
opensim-SC-2ac04cb624d36c048b6793f9db7c073eb6a01026.tar.xz
Merge branch 'master' into groups-core-contrib
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example8
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 643b0af..ff8fa5f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1369,3 +1369,11 @@
1369 ; config-include/GridCommon.ini.example (if you're connected to a grid) 1369 ; config-include/GridCommon.ini.example (if you're connected to a grid)
1370 ; Copy to your own .ini there (without .example extension) and edit it 1370 ; Copy to your own .ini there (without .example extension) and edit it
1371 ; to customize your data 1371 ; to customize your data
1372
1373
1374
1375 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1376 ;; The below pulls in optional module config files
1377 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1378[Modules]
1379 Include-modules = "addon-modules/*/config/*.ini"