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/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs | 4 ++--
 OpenSim/Services/Interfaces/IGridService.cs                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
index 71334ee..b999509 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
@@ -201,8 +201,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
             NameValueCollection requestArgs = new NameValueCollection
                 {
                         { "RequestMethod", "xAddMapTile" },
-                        { "X", scene.RegionInfo.LegacyRegionLocX.ToString() },
-                        { "Y", scene.RegionInfo.LegacyRegionLocY.ToString() },
+                        { "X", scene.RegionInfo.RegionLocX.ToString() },
+                        { "Y", scene.RegionInfo.RegionLocY.ToString() },
                         { "ContentType", "image/png" },
                         { "EncodedData", System.Convert.ToBase64String(pngData) }
                 };
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index e1a3cef..df2b4d7 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -255,8 +255,8 @@ namespace OpenSim.Services.Interfaces
         public GridRegion(RegionInfo ConvertFrom)
         {
             m_regionName = ConvertFrom.RegionName;
-            m_regionLocX = (int)(ConvertFrom.RegionWorldLocX);
-            m_regionLocY = (int)(ConvertFrom.RegionWorldLocY);
+            m_regionLocX = (int)(ConvertFrom.WorldLocX);
+            m_regionLocY = (int)(ConvertFrom.WorldLocY);
             RegionSizeX = (int)ConvertFrom.RegionSizeX;
             RegionSizeY = (int)ConvertFrom.RegionSizeY;
             m_internalEndPoint = ConvertFrom.InternalEndPoint;
-- 
cgit v1.1