diff options
| author | Melanie | 2010-09-05 15:06:00 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-05 15:06:00 +0100 |
| commit | e4c2b44e5cb756b957a96d13ad9a611dfba12df4 (patch) | |
| tree | d7978fc31ce346cae467df7a81737cfa323ae6c1 /bin/OpenSim.ini.example | |
| parent | Remove "Dwell" support from core and replace it with calls to methods (diff) | |
| parent | Remove "Dwell" support from core and replace it with calls to methods (diff) | |
| download | opensim-SC-e4c2b44e5cb756b957a96d13ad9a611dfba12df4.zip opensim-SC-e4c2b44e5cb756b957a96d13ad9a611dfba12df4.tar.gz opensim-SC-e4c2b44e5cb756b957a96d13ad9a611dfba12df4.tar.bz2 opensim-SC-e4c2b44e5cb756b957a96d13ad9a611dfba12df4.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'bin/OpenSim.ini.example')
| -rw-r--r-- | bin/OpenSim.ini.example | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index f95c428..9fd7e46 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -646,7 +646,7 @@ | |||
| 646 | ; {2} - region UUID | 646 | ; {2} - region UUID |
| 647 | ; {3} - region port | 647 | ; {3} - region port |
| 648 | ; {4} - region name with " ", ":", "/" mapped to "_" | 648 | ; {4} - region name with " ", ":", "/" mapped to "_" |
| 649 | region_file_template = "{0}x{1}-{2}.xml" | 649 | region_file_template = "{0}x{1}-{2}.ini" |
| 650 | 650 | ||
| 651 | ; we can limit the number of regions that XmlRpcCreateRegion will | 651 | ; we can limit the number of regions that XmlRpcCreateRegion will |
| 652 | ; allow by setting this to a positive, non-0 number: as long as the | 652 | ; allow by setting this to a positive, non-0 number: as long as the |
| @@ -1325,11 +1325,12 @@ Message = "The MOTD module is working!" | |||
| 1325 | [Architecture] | 1325 | [Architecture] |
| 1326 | ; Choose exactly one and only one of the architectures below. | 1326 | ; Choose exactly one and only one of the architectures below. |
| 1327 | 1327 | ||
| 1328 | Include-Standalone = "config-include/Standalone.ini" | 1328 | Include-Standalone = "config-include/Standalone.ini" |
| 1329 | ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini" | 1329 | ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini" |
| 1330 | ;Include-Grid = "config-include/Grid.ini" | 1330 | ;Include-Grid = "config-include/Grid.ini" |
| 1331 | ;Include-HGGrid = "config-include/GridHypergrid.ini" | 1331 | ;Include-HGGrid = "config-include/GridHypergrid.ini" |
| 1332 | ;Include-SimianGrid = "config-include/SimianGrid.ini" | 1332 | ;Include-SimianGrid = "config-include/SimianGrid.ini" |
| 1333 | ;Include-HyperSimianGrid = "config-include/HyperSimianGrid.ini" | ||
| 1333 | 1334 | ||
| 1334 | ; Then choose | 1335 | ; Then choose |
| 1335 | ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR | 1336 | ; config-include/StandaloneCommon.ini.example (if you're in standlone) OR |