diff options
| author | Melanie | 2013-01-31 20:16:45 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-31 20:16:45 +0000 |
| commit | e497cf6f046f962815a216335cc9a6f7f2d9924f (patch) | |
| tree | 594872079760aab626dab1ad71eeca52cee7b10d /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC_OLD-e497cf6f046f962815a216335cc9a6f7f2d9924f.zip opensim-SC_OLD-e497cf6f046f962815a216335cc9a6f7f2d9924f.tar.gz opensim-SC_OLD-e497cf6f046f962815a216335cc9a6f7f2d9924f.tar.bz2 opensim-SC_OLD-e497cf6f046f962815a216335cc9a6f7f2d9924f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/Regions/Regions.ini.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example index 54a841d..f5282a7 100644 --- a/bin/Regions/Regions.ini.example +++ b/bin/Regions/Regions.ini.example | |||
| @@ -45,3 +45,4 @@ ExternalHostName = "SYSTEMIP" | |||
| 45 | ; * | 45 | ; * |
| 46 | 46 | ||
| 47 | ; RegionType = "Mainland" | 47 | ; RegionType = "Mainland" |
| 48 | ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" | ||