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/WorldMap/WorldMapModule.cs | |
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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 22 |
1 files changed, 11 insertions, 11 deletions
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 | ||