diff options
author | Robert Adams | 2013-12-14 07:53:01 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-14 07:53:01 -0800 |
commit | 13a9a4b653c5470e6a450bfd9b2049273a4ef7b2 (patch) | |
tree | 1168d93ebfff04893ec05a32c6bad456e1d00d32 /OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.zip opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.gz opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.bz2 opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.xz |
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index d991a30..9766bfe 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -561,8 +561,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
561 | /// <param name="fileStartY">Where to begin our slice</param> | 561 | /// <param name="fileStartY">Where to begin our slice</param> |
562 | public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) | 562 | public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) |
563 | { | 563 | { |
564 | int offsetX = (int) m_scene.RegionInfo.LegacyRegionLocX - fileStartX; | 564 | int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX; |
565 | int offsetY = (int) m_scene.RegionInfo.LegacyRegionLocY - fileStartY; | 565 | int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY; |
566 | 566 | ||
567 | if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight) | 567 | if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight) |
568 | { | 568 | { |
@@ -602,14 +602,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
602 | /// <param name="fileStartY">The may y co-ordinate at which to begin the save.</param> | 602 | /// <param name="fileStartY">The may y co-ordinate at which to begin the save.</param> |
603 | public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) | 603 | public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) |
604 | { | 604 | { |
605 | int offsetX = (int)m_scene.RegionInfo.LegacyRegionLocX - fileStartX; | 605 | int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX; |
606 | int offsetY = (int)m_scene.RegionInfo.LegacyRegionLocY - fileStartY; | 606 | int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY; |
607 | 607 | ||
608 | if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight) | 608 | if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight) |
609 | { | 609 | { |
610 | MainConsole.Instance.OutputFormat( | 610 | MainConsole.Instance.OutputFormat( |
611 | "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.", | 611 | "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.", |
612 | m_scene.RegionInfo.LegacyRegionLocX, m_scene.RegionInfo.LegacyRegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); | 612 | m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); |
613 | 613 | ||
614 | return; | 614 | return; |
615 | } | 615 | } |