diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /bin/RegionConfig.ini.example | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to '')
| -rw-r--r-- | bin/RegionConfig.ini.example | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/bin/RegionConfig.ini.example b/bin/RegionConfig.ini.example index 8d833df..d45fe9d 100644 --- a/bin/RegionConfig.ini.example +++ b/bin/RegionConfig.ini.example | |||
| @@ -20,17 +20,6 @@ AllowAlternatePorts = False | |||
| 20 | ExternalHostName = "SYSTEMIP" | 20 | ExternalHostName = "SYSTEMIP" |
| 21 | 21 | ||
| 22 | ; * | 22 | ; * |
| 23 | ; * Master avatar stuff. Set either a UUID (from OSGrid or your server) | ||
| 24 | ; * OR a first and last name. Password is only needed for sandbox mode | ||
| 25 | ; * The default assigns no master avatar | ||
| 26 | ; * | ||
| 27 | |||
| 28 | MasterAvatarUUID = "00000000-0000-0000-0000-000000000000" | ||
| 29 | ; MasterAvatarFirstName = "" | ||
| 30 | ; MasterAvatarLastName = "" | ||
| 31 | ; MasterAvatarSandboxPassword = "" | ||
| 32 | |||
| 33 | ; * | ||
| 34 | ; * Prim data | 23 | ; * Prim data |
| 35 | ; * This allows limiting the sizes of prims and the region prim count | 24 | ; * This allows limiting the sizes of prims and the region prim count |
| 36 | ; * | 25 | ; * |