From 13a9a4b653c5470e6a450bfd9b2049273a4ef7b2 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 14 Dec 2013 07:53:01 -0800
Subject: 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.
---
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs')
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
/// Where to begin our slice
public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
{
- int offsetX = (int) m_scene.RegionInfo.LegacyRegionLocX - fileStartX;
- int offsetY = (int) m_scene.RegionInfo.LegacyRegionLocY - fileStartY;
+ int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX;
+ int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY;
if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight)
{
@@ -602,14 +602,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain
/// The may y co-ordinate at which to begin the save.
public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY)
{
- int offsetX = (int)m_scene.RegionInfo.LegacyRegionLocX - fileStartX;
- int offsetY = (int)m_scene.RegionInfo.LegacyRegionLocY - fileStartY;
+ int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX;
+ int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY;
if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight)
{
MainConsole.Instance.OutputFormat(
"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.",
- m_scene.RegionInfo.LegacyRegionLocX, m_scene.RegionInfo.LegacyRegionLocY, fileWidth, fileStartX, fileHeight, fileStartY);
+ m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY);
return;
}
--
cgit v1.1