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. --- .../Region/CoreModules/Avatar/Chat/ChatModule.cs | 4 ++-- .../Avatar/UserProfiles/UserProfileModule.cs | 4 ++-- .../EntityTransfer/EntityTransferModule.cs | 24 +++++++++++----------- .../Scripting/EMailModules/EmailModule.cs | 4 ++-- .../MapImage/MapImageServiceModule.cs | 4 ++-- .../World/Archiver/ArchiveScenesGroup.cs | 8 ++++---- .../World/Archiver/DearchiveScenesGroup.cs | 2 +- .../World/Estate/EstateManagementCommands.cs | 12 +++++------ .../CoreModules/World/Land/LandManagementModule.cs | 4 ++-- .../CoreModules/World/Terrain/TerrainModule.cs | 10 ++++----- .../CoreModules/World/WorldMap/WorldMapModule.cs | 22 ++++++++++---------- 11 files changed, 49 insertions(+), 49 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index db62b31..10122e6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -189,7 +189,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat string message = c.Message; Scene scene = (Scene)c.Scene; Vector3 fromPos = c.Position; - Vector3 regionPos = new Vector3(scene.RegionInfo.RegionWorldLocX, scene.RegionInfo.RegionWorldLocY, 0); + Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0); if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel; @@ -341,7 +341,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat { Vector3 fromRegionPos = fromPos + regionPos; Vector3 toRegionPos = presence.AbsolutePosition + - new Vector3(presence.Scene.RegionInfo.RegionWorldLocX, presence.Scene.RegionInfo.RegionWorldLocY, 0); + new Vector3(presence.Scene.RegionInfo.WorldLocX, presence.Scene.RegionInfo.WorldLocY, 0); int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos); diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index a982466..80dfa04 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs @@ -663,8 +663,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles Vector3 avaPos = p.AbsolutePosition; // Getting the global position for the Avatar - Vector3 posGlobal = new Vector3(remoteClient.Scene.RegionInfo.RegionWorldLocX + avaPos.X, - remoteClient.Scene.RegionInfo.RegionWorldLocY + avaPos.Y, + Vector3 posGlobal = new Vector3(remoteClient.Scene.RegionInfo.WorldLocX + avaPos.X, + remoteClient.Scene.RegionInfo.WorldLocY + avaPos.Y, avaPos.Z); string landOwnerName = string.Empty; diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index c3d0765..1bb3e3b 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -491,8 +491,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer } // Check that these are not the same coordinates - if (finalDestination.RegionLocX == sp.Scene.RegionInfo.LegacyRegionLocX && - finalDestination.RegionLocY == sp.Scene.RegionInfo.LegacyRegionLocY) + if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX && + finalDestination.RegionLocY == sp.Scene.RegionInfo.RegionLocY) { // Can't do. Viewer crashes sp.ControllingClient.SendTeleportFailed("Space warp! You would crash. Move to a different region and try again."); @@ -564,8 +564,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer // destRegionX, destRegionY, finalDestination.RegionID, finalDestination.ServerURI); // Insanely, RegionLoc on RegionInfo is the 256m map co-ord whilst GridRegion.RegionLoc is the raw meters position. - return Math.Abs(sourceRegion.LegacyRegionLocX - destRegion.RegionCoordX) <= MaxTransferDistance - && Math.Abs(sourceRegion.LegacyRegionLocY - destRegion.RegionCoordY) <= MaxTransferDistance; + return Math.Abs(sourceRegion.RegionLocX - destRegion.RegionCoordX) <= MaxTransferDistance + && Math.Abs(sourceRegion.RegionLocY - destRegion.RegionCoordY) <= MaxTransferDistance; } /// @@ -632,7 +632,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer string.Format( "Can't teleport to {0} ({1},{2}) from {3} ({4},{5}), destination is more than {6} regions way", finalDestination.RegionName, finalDestination.RegionCoordX, finalDestination.RegionCoordY, - sourceRegion.RegionName, sourceRegion.LegacyRegionLocX, sourceRegion.LegacyRegionLocY, + sourceRegion.RegionName, sourceRegion.RegionLocX, sourceRegion.RegionLocY, MaxTransferDistance)); return; @@ -1919,7 +1919,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer if (m_regionInfo != null) { - neighbours = RequestNeighbours(sp, m_regionInfo.LegacyRegionLocX, m_regionInfo.LegacyRegionLocY); + neighbours = RequestNeighbours(sp, m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); } else { @@ -2244,10 +2244,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer extent.X = ((int)extent.X / (int)Constants.RegionSize); extent.Y = ((int)extent.Y / (int)Constants.RegionSize); - swCorner.X = Scene.RegionInfo.LegacyRegionLocX - 1; - swCorner.Y = Scene.RegionInfo.LegacyRegionLocY - 1; - neCorner.X = Scene.RegionInfo.LegacyRegionLocX + extent.X; - neCorner.Y = Scene.RegionInfo.LegacyRegionLocY + extent.Y; + swCorner.X = Scene.RegionInfo.RegionLocX - 1; + swCorner.Y = Scene.RegionInfo.RegionLocY - 1; + neCorner.X = Scene.RegionInfo.RegionLocX + extent.X; + neCorner.Y = Scene.RegionInfo.RegionLocY + extent.Y; } /// @@ -2560,8 +2560,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer Vector3 oldGroupPosition = grp.RootPart.GroupPosition; // Compute the absolute position of the object. - double objectWorldLocX = (double)scene.RegionInfo.RegionWorldLocX + attemptedPosition.X; - double objectWorldLocY = (double)scene.RegionInfo.RegionWorldLocY + attemptedPosition.Y; + double objectWorldLocX = (double)scene.RegionInfo.WorldLocX + attemptedPosition.X; + double objectWorldLocY = (double)scene.RegionInfo.WorldLocY + attemptedPosition.Y; // Ask the grid service for the region that contains the passed address GridRegion destination = GetRegionContainingWorldLocation(scene.GridService, scene.RegionInfo.ScopeID, objectWorldLocX, objectWorldLocY); diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs index bf87392..4e7ad75 100644 --- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs @@ -213,8 +213,8 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules if (part != null) { ObjectRegionName = s.RegionInfo.RegionName; - uint localX = s.RegionInfo.RegionWorldLocX; - uint localY = s.RegionInfo.RegionWorldLocY; + uint localX = s.RegionInfo.WorldLocX; + uint localY = s.RegionInfo.WorldLocY; ObjectRegionName = ObjectRegionName + " (" + localX + ", " + localY + ")"; return part; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs index c1f2f04..26d22b8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs @@ -224,10 +224,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage } string reason = string.Empty; - if (!m_MapService.AddMapTile((int)scene.RegionInfo.LegacyRegionLocX, (int)scene.RegionInfo.LegacyRegionLocY, jpgData, out reason)) + if (!m_MapService.AddMapTile((int)scene.RegionInfo.RegionLocX, (int)scene.RegionInfo.RegionLocY, jpgData, out reason)) { m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}", - scene.RegionInfo.RegionName, scene.RegionInfo.LegacyRegionLocX, scene.RegionInfo.LegacyRegionLocY, reason); + scene.RegionInfo.RegionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, reason); } } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs index 9aa4243..d8dace2 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveScenesGroup.cs @@ -71,8 +71,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void AddScene(Scene scene) { - uint x = scene.RegionInfo.LegacyRegionLocX; - uint y = scene.RegionInfo.LegacyRegionLocY; + uint x = scene.RegionInfo.RegionLocX; + uint y = scene.RegionInfo.RegionLocY; SortedDictionary row; if (!Regions.TryGetValue(y, out row)) @@ -120,8 +120,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver { // We add the region's coordinates to ensure uniqueness even if multiple regions have the same name string path = string.Format("{0}_{1}_{2}", - scene.RegionInfo.LegacyRegionLocX - Rect.X + 1, - scene.RegionInfo.LegacyRegionLocY - Rect.Y + 1, + scene.RegionInfo.RegionLocX - Rect.X + 1, + scene.RegionInfo.RegionLocY - Rect.Y + 1, scene.RegionInfo.RegionName.Replace(' ', '_')); m_regionDirs[scene.RegionInfo.RegionID] = path; }); diff --git a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs index 25f1e5c..3dcc020 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/DearchiveScenesGroup.cs @@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver { foreach (RegionInfo archivedRegion in m_directory2region.Values) { - Point location = new Point((int)rootScene.RegionInfo.LegacyRegionLocX, (int)rootScene.RegionInfo.LegacyRegionLocY); + Point location = new Point((int)rootScene.RegionInfo.RegionLocX, (int)rootScene.RegionInfo.RegionLocY); location.Offset(archivedRegion.Location); Scene scene; 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); diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index a68f67f..99db7ff 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -1798,8 +1798,8 @@ namespace OpenSim.Region.CoreModules.World.Land // HACK for now RegionInfo r = new RegionInfo(); r.RegionName = info.RegionName; - r.LegacyRegionLocX = (uint)info.RegionLocX; - r.LegacyRegionLocY = (uint)info.RegionLocY; + r.RegionLocX = (uint)info.RegionLocX; + r.RegionLocY = (uint)info.RegionLocY; r.RegionSettings.Maturity = (int)Util.ConvertAccessLevelToMaturity(data.RegionAccess); remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); } diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index d991a30..9766bfe 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs @@ -561,8 +561,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain /// Where to begin our slice public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) { - int offsetX = (int) m_scene.RegionInfo.LegacyRegionLocX - fileStartX; - int offsetY = (int) m_scene.RegionInfo.LegacyRegionLocY - fileStartY; + int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX; + int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY; if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight) { @@ -602,14 +602,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain /// The may y co-ordinate at which to begin the save. public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) { - int offsetX = (int)m_scene.RegionInfo.LegacyRegionLocX - fileStartX; - int offsetY = (int)m_scene.RegionInfo.LegacyRegionLocY - fileStartY; + int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX; + int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY; if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight) { MainConsole.Instance.OutputFormat( "ERROR: file width + minimum X tile and file height + minimum Y tile must incorporate the current region at ({0},{1}). File width {2} from {3} and file height {4} from {5} does not.", - m_scene.RegionInfo.LegacyRegionLocX, m_scene.RegionInfo.LegacyRegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); + m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); return; } diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 2d564fe..cd315b1 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. - if (m_scene.RegionInfo.LegacyRegionLocX >= 2048 || m_scene.RegionInfo.LegacyRegionLocY >= 2048) + if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048) { ScenePresence avatarPresence = null; @@ -278,10 +278,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap List mapBlocks = new List(); ; List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, - (int)(m_scene.RegionInfo.LegacyRegionLocX - 8) * (int)Constants.RegionSize, - (int)(m_scene.RegionInfo.LegacyRegionLocX + 8) * (int)Constants.RegionSize, - (int)(m_scene.RegionInfo.LegacyRegionLocY - 8) * (int)Constants.RegionSize, - (int)(m_scene.RegionInfo.LegacyRegionLocY + 8) * (int)Constants.RegionSize); + (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize); foreach (GridRegion r in regions) { MapBlockData block = new MapBlockData(); @@ -1218,10 +1218,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap List mapBlocks = new List(); List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, - (int)(m_scene.RegionInfo.LegacyRegionLocX - 9) * (int)Constants.RegionSize, - (int)(m_scene.RegionInfo.LegacyRegionLocX + 9) * (int)Constants.RegionSize, - (int)(m_scene.RegionInfo.LegacyRegionLocY - 9) * (int)Constants.RegionSize, - (int)(m_scene.RegionInfo.LegacyRegionLocY + 9) * (int)Constants.RegionSize); + (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize); List textures = new List(); List bitImages = new List(); @@ -1262,8 +1262,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap for (int i = 0; i < mapBlocks.Count; i++) { - ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.LegacyRegionLocX) + 10); - ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.LegacyRegionLocY) + 10); + ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.RegionLocX) + 10); + ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.RegionLocY) + 10); g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top } -- cgit v1.1