diff options
| author | John Hurliman | 2010-09-03 13:36:35 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-03 13:36:35 -0700 |
| commit | 4f79143f3f058b0570c073b668f4ea088e541a43 (patch) | |
| tree | f95d821dc052c8a66b66a49fe413c6cce639dec3 /bin/OpenSim.ini.example | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-4f79143f3f058b0570c073b668f4ea088e541a43.zip opensim-SC_OLD-4f79143f3f058b0570c073b668f4ea088e541a43.tar.gz opensim-SC_OLD-4f79143f3f058b0570c073b668f4ea088e541a43.tar.bz2 opensim-SC_OLD-4f79143f3f058b0570c073b668f4ea088e541a43.tar.xz | |
* Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to handle initialization as graceful as possible with the current broken way region module initialization is done
* Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
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 |