diff options
| author | John Hurliman | 2010-09-03 14:50:42 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-03 14:50:42 -0700 |
| commit | 1e552e88e864da2e168fc4cf4df458688c1eab3d (patch) | |
| tree | 0f3be001473ef0f1f1636749463c86591cb1b4e1 /bin | |
| parent | Make SimianFriendsServiceConnector initialize like the other connectors and g... (diff) | |
| parent | In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ra... (diff) | |
| download | opensim-SC_OLD-1e552e88e864da2e168fc4cf4df458688c1eab3d.zip opensim-SC_OLD-1e552e88e864da2e168fc4cf4df458688c1eab3d.tar.gz opensim-SC_OLD-1e552e88e864da2e168fc4cf4df458688c1eab3d.tar.bz2 opensim-SC_OLD-1e552e88e864da2e168fc4cf4df458688c1eab3d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSim.ini.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 71c7e55..08726ea 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -640,7 +640,7 @@ | |||
| 640 | ; {2} - region UUID | 640 | ; {2} - region UUID |
| 641 | ; {3} - region port | 641 | ; {3} - region port |
| 642 | ; {4} - region name with " ", ":", "/" mapped to "_" | 642 | ; {4} - region name with " ", ":", "/" mapped to "_" |
| 643 | region_file_template = "{0}x{1}-{2}.xml" | 643 | region_file_template = "{0}x{1}-{2}.ini" |
| 644 | 644 | ||
| 645 | ; we can limit the number of regions that XmlRpcCreateRegion will | 645 | ; we can limit the number of regions that XmlRpcCreateRegion will |
| 646 | ; allow by setting this to a positive, non-0 number: as long as the | 646 | ; allow by setting this to a positive, non-0 number: as long as the |