diff options
author | Robert Adams | 2013-12-14 07:53:01 -0800 |
---|---|---|
committer | Robert Adams | 2013-12-14 07:53:01 -0800 |
commit | 13a9a4b653c5470e6a450bfd9b2049273a4ef7b2 (patch) | |
tree | 1168d93ebfff04893ec05a32c6bad456e1d00d32 /OpenSim/Region/CoreModules/World | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.zip opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.gz opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.bz2 opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.xz |
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.
Diffstat (limited to '')
6 files changed, 29 insertions, 29 deletions
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 | |||
71 | 71 | ||
72 | public void AddScene(Scene scene) | 72 | public void AddScene(Scene scene) |
73 | { | 73 | { |
74 | uint x = scene.RegionInfo.LegacyRegionLocX; | 74 | uint x = scene.RegionInfo.RegionLocX; |
75 | uint y = scene.RegionInfo.LegacyRegionLocY; | 75 | uint y = scene.RegionInfo.RegionLocY; |
76 | 76 | ||
77 | SortedDictionary<uint, Scene> row; | 77 | SortedDictionary<uint, Scene> row; |
78 | if (!Regions.TryGetValue(y, out row)) | 78 | if (!Regions.TryGetValue(y, out row)) |
@@ -120,8 +120,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
120 | { | 120 | { |
121 | // We add the region's coordinates to ensure uniqueness even if multiple regions have the same name | 121 | // We add the region's coordinates to ensure uniqueness even if multiple regions have the same name |
122 | string path = string.Format("{0}_{1}_{2}", | 122 | string path = string.Format("{0}_{1}_{2}", |
123 | scene.RegionInfo.LegacyRegionLocX - Rect.X + 1, | 123 | scene.RegionInfo.RegionLocX - Rect.X + 1, |
124 | scene.RegionInfo.LegacyRegionLocY - Rect.Y + 1, | 124 | scene.RegionInfo.RegionLocY - Rect.Y + 1, |
125 | scene.RegionInfo.RegionName.Replace(' ', '_')); | 125 | scene.RegionInfo.RegionName.Replace(' ', '_')); |
126 | m_regionDirs[scene.RegionInfo.RegionID] = path; | 126 | m_regionDirs[scene.RegionInfo.RegionID] = path; |
127 | }); | 127 | }); |
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 | |||
145 | { | 145 | { |
146 | foreach (RegionInfo archivedRegion in m_directory2region.Values) | 146 | foreach (RegionInfo archivedRegion in m_directory2region.Values) |
147 | { | 147 | { |
148 | Point location = new Point((int)rootScene.RegionInfo.LegacyRegionLocX, (int)rootScene.RegionInfo.LegacyRegionLocY); | 148 | Point location = new Point((int)rootScene.RegionInfo.RegionLocX, (int)rootScene.RegionInfo.RegionLocY); |
149 | location.Offset(archivedRegion.Location); | 149 | location.Offset(archivedRegion.Location); |
150 | 150 | ||
151 | Scene scene; | 151 | 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 | |||
96 | int x = (args.Length > 5 ? int.Parse(args[5]) : -1); | 96 | int x = (args.Length > 5 ? int.Parse(args[5]) : -1); |
97 | int y = (args.Length > 6 ? int.Parse(args[6]) : -1); | 97 | int y = (args.Length > 6 ? int.Parse(args[6]) : -1); |
98 | 98 | ||
99 | if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) | 99 | if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) |
100 | { | 100 | { |
101 | if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) | 101 | if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) |
102 | { | 102 | { |
103 | int corner = int.Parse(num); | 103 | int corner = int.Parse(num); |
104 | UUID texture = UUID.Parse(uuid); | 104 | UUID texture = UUID.Parse(uuid); |
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
135 | int x = (args.Length > 4 ? int.Parse(args[4]) : -1); | 135 | int x = (args.Length > 4 ? int.Parse(args[4]) : -1); |
136 | int y = (args.Length > 5 ? int.Parse(args[5]) : -1); | 136 | int y = (args.Length > 5 ? int.Parse(args[5]) : -1); |
137 | 137 | ||
138 | if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) | 138 | if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) |
139 | { | 139 | { |
140 | if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) | 140 | if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) |
141 | { | 141 | { |
142 | double selectedheight = double.Parse(heightstring); | 142 | double selectedheight = double.Parse(heightstring); |
143 | 143 | ||
@@ -159,9 +159,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
159 | int x = (args.Length > 6 ? int.Parse(args[6]) : -1); | 159 | int x = (args.Length > 6 ? int.Parse(args[6]) : -1); |
160 | int y = (args.Length > 7 ? int.Parse(args[7]) : -1); | 160 | int y = (args.Length > 7 ? int.Parse(args[7]) : -1); |
161 | 161 | ||
162 | if (x == -1 || m_module.Scene.RegionInfo.LegacyRegionLocX == x) | 162 | if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x) |
163 | { | 163 | { |
164 | if (y == -1 || m_module.Scene.RegionInfo.LegacyRegionLocY == y) | 164 | if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y) |
165 | { | 165 | { |
166 | int corner = int.Parse(num); | 166 | int corner = int.Parse(num); |
167 | float lowValue = float.Parse(min, Culture.NumberFormatInfo); | 167 | 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 | |||
1798 | // HACK for now | 1798 | // HACK for now |
1799 | RegionInfo r = new RegionInfo(); | 1799 | RegionInfo r = new RegionInfo(); |
1800 | r.RegionName = info.RegionName; | 1800 | r.RegionName = info.RegionName; |
1801 | r.LegacyRegionLocX = (uint)info.RegionLocX; | 1801 | r.RegionLocX = (uint)info.RegionLocX; |
1802 | r.LegacyRegionLocY = (uint)info.RegionLocY; | 1802 | r.RegionLocY = (uint)info.RegionLocY; |
1803 | r.RegionSettings.Maturity = (int)Util.ConvertAccessLevelToMaturity(data.RegionAccess); | 1803 | r.RegionSettings.Maturity = (int)Util.ConvertAccessLevelToMaturity(data.RegionAccess); |
1804 | remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); | 1804 | remoteClient.SendParcelInfo(r, data.LandData, parcelID, data.X, data.Y); |
1805 | } | 1805 | } |
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 | |||
561 | /// <param name="fileStartY">Where to begin our slice</param> | 561 | /// <param name="fileStartY">Where to begin our slice</param> |
562 | public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) | 562 | public void LoadFromFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) |
563 | { | 563 | { |
564 | int offsetX = (int) m_scene.RegionInfo.LegacyRegionLocX - fileStartX; | 564 | int offsetX = (int) m_scene.RegionInfo.RegionLocX - fileStartX; |
565 | int offsetY = (int) m_scene.RegionInfo.LegacyRegionLocY - fileStartY; | 565 | int offsetY = (int) m_scene.RegionInfo.RegionLocY - fileStartY; |
566 | 566 | ||
567 | if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight) | 567 | if (offsetX >= 0 && offsetX < fileWidth && offsetY >= 0 && offsetY < fileHeight) |
568 | { | 568 | { |
@@ -602,14 +602,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
602 | /// <param name="fileStartY">The may y co-ordinate at which to begin the save.</param> | 602 | /// <param name="fileStartY">The may y co-ordinate at which to begin the save.</param> |
603 | public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) | 603 | public void SaveToFile(string filename, int fileWidth, int fileHeight, int fileStartX, int fileStartY) |
604 | { | 604 | { |
605 | int offsetX = (int)m_scene.RegionInfo.LegacyRegionLocX - fileStartX; | 605 | int offsetX = (int)m_scene.RegionInfo.RegionLocX - fileStartX; |
606 | int offsetY = (int)m_scene.RegionInfo.LegacyRegionLocY - fileStartY; | 606 | int offsetY = (int)m_scene.RegionInfo.RegionLocY - fileStartY; |
607 | 607 | ||
608 | if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight) | 608 | if (offsetX < 0 || offsetX >= fileWidth || offsetY < 0 || offsetY >= fileHeight) |
609 | { | 609 | { |
610 | MainConsole.Instance.OutputFormat( | 610 | MainConsole.Instance.OutputFormat( |
611 | "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.", | 611 | "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.", |
612 | m_scene.RegionInfo.LegacyRegionLocX, m_scene.RegionInfo.LegacyRegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); | 612 | m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, fileWidth, fileStartX, fileHeight, fileStartY); |
613 | 613 | ||
614 | return; | 614 | return; |
615 | } | 615 | } |
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 | |||
249 | // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is | 249 | // 6/8/2011 -- I'm adding an explicit 2048 check, so that we never forget that there is |
250 | // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. | 250 | // a hack here, and so that regions below 4096 don't get spammed with unnecessary map blocks. |
251 | 251 | ||
252 | if (m_scene.RegionInfo.LegacyRegionLocX >= 2048 || m_scene.RegionInfo.LegacyRegionLocY >= 2048) | 252 | if (m_scene.RegionInfo.RegionLocX >= 2048 || m_scene.RegionInfo.RegionLocY >= 2048) |
253 | { | 253 | { |
254 | ScenePresence avatarPresence = null; | 254 | ScenePresence avatarPresence = null; |
255 | 255 | ||
@@ -278,10 +278,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
278 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); ; | 278 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); ; |
279 | 279 | ||
280 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 280 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
281 | (int)(m_scene.RegionInfo.LegacyRegionLocX - 8) * (int)Constants.RegionSize, | 281 | (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize, |
282 | (int)(m_scene.RegionInfo.LegacyRegionLocX + 8) * (int)Constants.RegionSize, | 282 | (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize, |
283 | (int)(m_scene.RegionInfo.LegacyRegionLocY - 8) * (int)Constants.RegionSize, | 283 | (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize, |
284 | (int)(m_scene.RegionInfo.LegacyRegionLocY + 8) * (int)Constants.RegionSize); | 284 | (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize); |
285 | foreach (GridRegion r in regions) | 285 | foreach (GridRegion r in regions) |
286 | { | 286 | { |
287 | MapBlockData block = new MapBlockData(); | 287 | MapBlockData block = new MapBlockData(); |
@@ -1218,10 +1218,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1218 | 1218 | ||
1219 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); | 1219 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); |
1220 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 1220 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
1221 | (int)(m_scene.RegionInfo.LegacyRegionLocX - 9) * (int)Constants.RegionSize, | 1221 | (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize, |
1222 | (int)(m_scene.RegionInfo.LegacyRegionLocX + 9) * (int)Constants.RegionSize, | 1222 | (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize, |
1223 | (int)(m_scene.RegionInfo.LegacyRegionLocY - 9) * (int)Constants.RegionSize, | 1223 | (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize, |
1224 | (int)(m_scene.RegionInfo.LegacyRegionLocY + 9) * (int)Constants.RegionSize); | 1224 | (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize); |
1225 | List<AssetBase> textures = new List<AssetBase>(); | 1225 | List<AssetBase> textures = new List<AssetBase>(); |
1226 | List<Image> bitImages = new List<Image>(); | 1226 | List<Image> bitImages = new List<Image>(); |
1227 | 1227 | ||
@@ -1262,8 +1262,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1262 | 1262 | ||
1263 | for (int i = 0; i < mapBlocks.Count; i++) | 1263 | for (int i = 0; i < mapBlocks.Count; i++) |
1264 | { | 1264 | { |
1265 | ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.LegacyRegionLocX) + 10); | 1265 | ushort x = (ushort)((mapBlocks[i].X - m_scene.RegionInfo.RegionLocX) + 10); |
1266 | ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.LegacyRegionLocY) + 10); | 1266 | ushort y = (ushort)((mapBlocks[i].Y - m_scene.RegionInfo.RegionLocY) + 10); |
1267 | g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top | 1267 | g.DrawImage(bitImages[i], (x * 128), 2560 - (y * 128), 128, 128); // y origin is top |
1268 | } | 1268 | } |
1269 | 1269 | ||