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/Application/OpenSim.cs     | 4 ++--
 OpenSim/Region/Application/OpenSimBase.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Application')

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 1d93e9b..c2d9942 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -825,8 +825,8 @@ namespace OpenSim
                                 MainConsole.Instance.Output(String.Format(
                                            "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}",
                                            scene.RegionInfo.RegionName,
-                                           scene.RegionInfo.LegacyRegionLocX,
-                                           scene.RegionInfo.LegacyRegionLocY,
+                                           scene.RegionInfo.RegionLocX,
+                                           scene.RegionInfo.RegionLocY,
                                            scene.RegionInfo.InternalEndPoint.Port,
                                            scene.RegionInfo.EstateSettings.EstateName));
                             });
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 7e7f42e..0dc9306 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -743,7 +743,7 @@ namespace OpenSim
         {
             m_log.InfoFormat(
                 "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", 
-                whichRegion.RegionName, whichRegion.LegacyRegionLocX, whichRegion.LegacyRegionLocY);
+                whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY);
 
             ShutdownClientServer(whichRegion);
             IScene scene;
-- 
cgit v1.1