From 96abbbb6fbab56e29c8a8af6974ef1df90e45ddf Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Thu, 19 Sep 2013 12:14:21 -0700 Subject: VarRegion: change RegionInfo storage of region coordinates from region count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages. --- .../RemoteController/RemoteAdminPlugin.cs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/ApplicationPlugins/RemoteController') diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index c78cf3b..7afdd34 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -542,7 +542,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.RegionLocX, scene.RegionInfo.RegionLocY)); + scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); } else { @@ -556,8 +556,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController region.RegionID = regionID; region.originRegionID = regionID; region.RegionName = (string) requestData["region_name"]; - region.RegionLocX = Convert.ToUInt32(requestData["region_x"]); - region.RegionLocY = Convert.ToUInt32(requestData["region_y"]); + region.LegacyRegionLocX = Convert.ToUInt32(requestData["region_x"]); + region.LegacyRegionLocY = Convert.ToUInt32(requestData["region_y"]); // check for collisions: region name, region UUID, // region location @@ -565,14 +565,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.RegionLocX, scene.RegionInfo.RegionLocY)); + scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); - if (m_application.SceneManager.TryGetScene(region.RegionLocX, region.RegionLocY, out scene)) + if (m_application.SceneManager.TryGetScene(region.LegacyRegionLocX, region.LegacyRegionLocY, out scene)) throw new Exception( String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>", - region.RegionLocX, region.RegionLocY, + region.LegacyRegionLocX, region.LegacyRegionLocY, scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, - scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); + scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); region.InternalEndPoint = new IPEndPoint(IPAddress.Parse((string) requestData["listen_ip"]), 0); @@ -586,7 +586,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController region.InternalEndPoint.Address, region.InternalEndPoint.Port, scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, - scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY)); + scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY)); region.ExternalHostName = (string) requestData["external_address"]; @@ -625,8 +625,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController String.Format( m_config.GetString("region_file_template", "{0}x{1}-{2}.ini"), - region.RegionLocX.ToString(), - region.RegionLocY.ToString(), + region.LegacyRegionLocX.ToString(), + region.LegacyRegionLocY.ToString(), regionID.ToString(), region.InternalEndPoint.Port.ToString(), region.RegionName.Replace(" ", "_").Replace(":", "_"). -- cgit v1.1