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/Framework/Scenes/Scene.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index be8aed1..3a5aa0f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1110,8 +1110,8 @@ namespace OpenSim.Region.Framework.Scenes
             if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
             {
                 // If these are cast to INT because long + negative values + abs returns invalid data
-                int resultX = Math.Abs((int)xcell - (int)RegionInfo.LegacyRegionLocX);
-                int resultY = Math.Abs((int)ycell - (int)RegionInfo.LegacyRegionLocY);
+                int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX);
+                int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY);
                 if (resultX <= 1 && resultY <= 1)
                 {
                     // Let the grid service module know, so this can be cached
@@ -1186,8 +1186,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// </returns>
         public int HaveNeighbor(Cardinals car, ref int[] fix)
         {
-            uint neighbourx = RegionInfo.LegacyRegionLocX;
-            uint neighboury = RegionInfo.LegacyRegionLocY;
+            uint neighbourx = RegionInfo.RegionLocX;
+            uint neighboury = RegionInfo.RegionLocY;
 
             int dir = (int)car;
 
@@ -1209,8 +1209,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (neighbourRegion == null)
             {
-                fix[0] = (int)(RegionInfo.LegacyRegionLocX - neighbourx);
-                fix[1] = (int)(RegionInfo.LegacyRegionLocY - neighboury);
+                fix[0] = (int)(RegionInfo.RegionLocX - neighbourx);
+                fix[1] = (int)(RegionInfo.RegionLocY - neighboury);
                 return dir * (-1);
             }
             else
@@ -4393,8 +4393,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     uint rRegionX = (uint)(cAgentData.RegionHandle >> 40);
                     uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8);
-                    uint tRegionX = RegionInfo.LegacyRegionLocX;
-                    uint tRegionY = RegionInfo.LegacyRegionLocY;
+                    uint tRegionX = RegionInfo.RegionLocX;
+                    uint tRegionY = RegionInfo.RegionLocY;
                     //Send Data to ScenePresence
                     childAgentUpdate.UpdateChildAgent(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY);
                     // Not Implemented:
@@ -4636,8 +4636,8 @@ namespace OpenSim.Region.Framework.Scenes
                 uint regionX, regionY;
                 Util.RegionHandleToWorldLoc(regionHandle, out regionX, out regionY);
 
-                int shiftx = (int) regionX - (int)RegionInfo.RegionWorldLocX;
-                int shifty = (int) regionY - (int)RegionInfo.RegionWorldLocY;
+                int shiftx = (int) regionX - (int)RegionInfo.WorldLocX;
+                int shifty = (int) regionY - (int)RegionInfo.WorldLocY;
 
                 position.X += shiftx;
                 position.Y += shifty;
-- 
cgit v1.1