diff options
| author | Sean Dague | 2009-08-06 14:03:16 -0400 |
|---|---|---|
| committer | Sean Dague | 2009-08-06 14:03:16 -0400 |
| commit | 4078a331e2e851c051293472776ebebcc5dbaecc (patch) | |
| tree | c172fb9173821f9a30d37ee336f6592ccaf4510f /bin | |
| parent | skip sqlite tests on z linux, as sqlite doesn't work right on the platform (diff) | |
| parent | Add the config-include statement to OpenSim.ini.example. (diff) | |
| download | opensim-SC_OLD-4078a331e2e851c051293472776ebebcc5dbaecc.zip opensim-SC_OLD-4078a331e2e851c051293472776ebebcc5dbaecc.tar.gz opensim-SC_OLD-4078a331e2e851c051293472776ebebcc5dbaecc.tar.bz2 opensim-SC_OLD-4078a331e2e851c051293472776ebebcc5dbaecc.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSim.ini.example | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 6ae6a95..bd03652 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -1362,3 +1362,11 @@ | |||
| 1362 | ; config-include/GridCommon.ini.example (if you're connected to a grid) | 1362 | ; config-include/GridCommon.ini.example (if you're connected to a grid) |
| 1363 | ; Copy to your own .ini there (without .example extension) and edit it | 1363 | ; Copy to your own .ini there (without .example extension) and edit it |
| 1364 | ; to customize your data | 1364 | ; to customize your data |
| 1365 | |||
| 1366 | |||
| 1367 | |||
| 1368 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||
| 1369 | ;; The below pulls in optional module config files | ||
| 1370 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | ||
| 1371 | [Modules] | ||
| 1372 | Include-modules = "addon-modules/*/config/*.ini" | ||