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. --- .../CoreModules/World/Estate/EstateManagementCommands.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Estate') diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs index bc172a4..173b603 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs @@ -96,9 +96,9 @@ namespace OpenSim.Region.CoreModules.World.Estate int x = (args.Length > 5 ? int.Parse(args[5]) : -1); int y = (args.Length > 6 ? int.Parse(args[6]) : -1); - if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) + if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) { - if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) + if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) { int corner = int.Parse(num); UUID texture = UUID.Parse(uuid); @@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.World.Estate int x = (args.Length > 4 ? int.Parse(args[4]) : -1); int y = (args.Length > 5 ? int.Parse(args[5]) : -1); - if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) + if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) { - if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) + if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) { double selectedheight = double.Parse(heightstring); @@ -159,9 +159,9 @@ namespace OpenSim.Region.CoreModules.World.Estate int x = (args.Length > 6 ? int.Parse(args[6]) : -1); int y = (args.Length > 7 ? int.Parse(args[7]) : -1); - if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) + if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) { - if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) + if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) { int corner = int.Parse(num); float lowValue = float.Parse(min, Culture.NumberFormatInfo); -- cgit v1.1