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/Framework/Scenes/Scene.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 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index be8aed1..3a5aa0f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1110,8 +1110,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1110 | if (RegionInfo.RegionHandle != otherRegion.RegionHandle) | 1110 | if (RegionInfo.RegionHandle != otherRegion.RegionHandle) |
1111 | { | 1111 | { |
1112 | // If these are cast to INT because long + negative values + abs returns invalid data | 1112 | // If these are cast to INT because long + negative values + abs returns invalid data |
1113 | int resultX = Math.Abs((int)xcell - (int)RegionInfo.LegacyRegionLocX); | 1113 | int resultX = Math.Abs((int)xcell - (int)RegionInfo.RegionLocX); |
1114 | int resultY = Math.Abs((int)ycell - (int)RegionInfo.LegacyRegionLocY); | 1114 | int resultY = Math.Abs((int)ycell - (int)RegionInfo.RegionLocY); |
1115 | if (resultX <= 1 && resultY <= 1) | 1115 | if (resultX <= 1 && resultY <= 1) |
1116 | { | 1116 | { |
1117 | // Let the grid service module know, so this can be cached | 1117 | // Let the grid service module know, so this can be cached |
@@ -1186,8 +1186,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1186 | /// </returns> | 1186 | /// </returns> |
1187 | public int HaveNeighbor(Cardinals car, ref int[] fix) | 1187 | public int HaveNeighbor(Cardinals car, ref int[] fix) |
1188 | { | 1188 | { |
1189 | uint neighbourx = RegionInfo.LegacyRegionLocX; | 1189 | uint neighbourx = RegionInfo.RegionLocX; |
1190 | uint neighboury = RegionInfo.LegacyRegionLocY; | 1190 | uint neighboury = RegionInfo.RegionLocY; |
1191 | 1191 | ||
1192 | int dir = (int)car; | 1192 | int dir = (int)car; |
1193 | 1193 | ||
@@ -1209,8 +1209,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1209 | 1209 | ||
1210 | if (neighbourRegion == null) | 1210 | if (neighbourRegion == null) |
1211 | { | 1211 | { |
1212 | fix[0] = (int)(RegionInfo.LegacyRegionLocX - neighbourx); | 1212 | fix[0] = (int)(RegionInfo.RegionLocX - neighbourx); |
1213 | fix[1] = (int)(RegionInfo.LegacyRegionLocY - neighboury); | 1213 | fix[1] = (int)(RegionInfo.RegionLocY - neighboury); |
1214 | return dir * (-1); | 1214 | return dir * (-1); |
1215 | } | 1215 | } |
1216 | else | 1216 | else |
@@ -4393,8 +4393,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4393 | { | 4393 | { |
4394 | uint rRegionX = (uint)(cAgentData.RegionHandle >> 40); | 4394 | uint rRegionX = (uint)(cAgentData.RegionHandle >> 40); |
4395 | uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8); | 4395 | uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8); |
4396 | uint tRegionX = RegionInfo.LegacyRegionLocX; | 4396 | uint tRegionX = RegionInfo.RegionLocX; |
4397 | uint tRegionY = RegionInfo.LegacyRegionLocY; | 4397 | uint tRegionY = RegionInfo.RegionLocY; |
4398 | //Send Data to ScenePresence | 4398 | //Send Data to ScenePresence |
4399 | childAgentUpdate.UpdateChildAgent(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); | 4399 | childAgentUpdate.UpdateChildAgent(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); |
4400 | // Not Implemented: | 4400 | // Not Implemented: |
@@ -4636,8 +4636,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4636 | uint regionX, regionY; | 4636 | uint regionX, regionY; |
4637 | Util.RegionHandleToWorldLoc(regionHandle, out regionX, out regionY); | 4637 | Util.RegionHandleToWorldLoc(regionHandle, out regionX, out regionY); |
4638 | 4638 | ||
4639 | int shiftx = (int) regionX - (int)RegionInfo.RegionWorldLocX; | 4639 | int shiftx = (int) regionX - (int)RegionInfo.WorldLocX; |
4640 | int shifty = (int) regionY - (int)RegionInfo.RegionWorldLocY; | 4640 | int shifty = (int) regionY - (int)RegionInfo.WorldLocY; |
4641 | 4641 | ||
4642 | position.X += shiftx; | 4642 | position.X += shiftx; |
4643 | position.Y += shifty; | 4643 | position.Y += shifty; |