diff options
| author | Justin Clark-Casey (justincc) | 2010-09-03 22:27:01 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-03 22:27:01 +0100 |
| commit | 9b95bd259fa15157947326f044f63aedc248e73c (patch) | |
| tree | b89733673d71a41529b40ea55f2e66d712991ecb /bin/OpenSim.ini.example | |
| parent | minor: remove mono compiler warning (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.zip opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.gz opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.bz2 opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index dac6477..71c7e55 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -1299,11 +1299,12 @@ | |||
| 1299 | [Architecture] | 1299 | [Architecture] |
| 1300 | ; Choose exactly one and only one of the architectures below. | 1300 | ; Choose exactly one and only one of the architectures below. |
| 1301 | 1301 | ||
| 1302 | Include-Standalone = "config-include/Standalone.ini" | 1302 | Include-Standalone = "config-include/Standalone.ini" |
| 1303 | ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini" | 1303 | ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini" |
| 1304 | ;Include-Grid = "config-include/Grid.ini" | 1304 | ;Include-Grid = "config-include/Grid.ini" |
| 1305 | ;Include-HGGrid = "config-include/GridHypergrid.ini" | 1305 | ;Include-HGGrid = "config-include/GridHypergrid.ini" |
| 1306 | ;Include-SimianGrid = "config-include/SimianGrid.ini" | 1306 | ;Include-SimianGrid = "config-include/SimianGrid.ini" |
| 1307 | ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini" | ||
| 1307 | 1308 | ||
| 1308 | ; Then choose | 1309 | ; Then choose |
| 1309 | ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR | 1310 | ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR |