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. --- .../LoadRegions/LoadRegionsPlugin.cs | 4 ++-- .../RemoteController/RemoteAdminPlugin.cs | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'OpenSim/ApplicationPlugins') diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 74a7a50..1d63d26 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs @@ -184,11 +184,11 @@ namespace OpenSim.ApplicationPlugins.LoadRegions return false; } else if ( - regions[i].LegacyRegionLocX == regions[j].LegacyRegionLocX && regions[i].LegacyRegionLocY == regions[j].LegacyRegionLocY) + regions[i].RegionLocX == regions[j].RegionLocX && regions[i].RegionLocY == regions[j].RegionLocY) { m_log.ErrorFormat( "[LOAD REGIONS PLUGIN]: Regions {0} and {1} have the same grid location ({2}, {3})", - regions[i].RegionName, regions[j].RegionName, regions[i].LegacyRegionLocX, regions[i].LegacyRegionLocY); + regions[i].RegionName, regions[j].RegionName, regions[i].RegionLocX, regions[i].RegionLocY); return false; } else if (regions[i].InternalEndPoint.Port == regions[j].InternalEndPoint.Port) diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 642e82e..ec58692 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -545,7 +545,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController throw new Exception( String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, - scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); + scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); } else { @@ -559,8 +559,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController region.RegionID = regionID; region.originRegionID = regionID; region.RegionName = (string) requestData["region_name"]; - region.LegacyRegionLocX = Convert.ToUInt32(requestData["region_x"]); - region.LegacyRegionLocY = Convert.ToUInt32(requestData["region_y"]); + region.RegionLocX = Convert.ToUInt32(requestData["region_x"]); + region.RegionLocY = Convert.ToUInt32(requestData["region_y"]); // check for collisions: region name, region UUID, // region location @@ -568,14 +568,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController throw new Exception( String.Format("region name already in use by region {0}, UUID {1}, <{2},{3}>", scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, - scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); + scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); - if (m_application.SceneManager.TryGetScene(region.LegacyRegionLocX, region.LegacyRegionLocY, out scene)) + if (m_application.SceneManager.TryGetScene(region.RegionLocX, region.RegionLocY, out scene)) throw new Exception( String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>", - region.LegacyRegionLocX, region.LegacyRegionLocY, + region.RegionLocX, region.RegionLocY, scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, - scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); + scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); region.InternalEndPoint = new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0); @@ -589,7 +589,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController region.InternalEndPoint.Address, region.InternalEndPoint.Port, scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, - scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); + scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); region.ExternalHostName = (string) requestData["external_address"]; @@ -628,8 +628,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController String.Format( m_config.GetString("region_file_template", "{0}x{1}-{2}.ini"), - region.LegacyRegionLocX.ToString(), - region.LegacyRegionLocY.ToString(), + region.RegionLocX.ToString(), + region.RegionLocY.ToString(), regionID.ToString(), region.InternalEndPoint.Port.ToString(), region.RegionName.Replace(" ", "_").Replace(":", "_"). -- cgit v1.1