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/ScenePresence.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/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8eb6f7d..3f5db12 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -702,7 +702,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
702 | uint x, y; | 702 | uint x, y; |
703 | Util.RegionHandleToRegionLoc(handle, out x, out y); | 703 | Util.RegionHandleToRegionLoc(handle, out x, out y); |
704 | 704 | ||
705 | if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.LegacyRegionLocX, y, Scene.RegionInfo.LegacyRegionLocY)) | 705 | if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.RegionLocX, y, Scene.RegionInfo.RegionLocY)) |
706 | { | 706 | { |
707 | old.Add(handle); | 707 | old.Add(handle); |
708 | } | 708 | } |
@@ -2115,8 +2115,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2115 | // } | 2115 | // } |
2116 | 2116 | ||
2117 | // Get terrain height for sub-region in a megaregion if necessary | 2117 | // Get terrain height for sub-region in a megaregion if necessary |
2118 | int X = (int)((m_scene.RegionInfo.RegionWorldLocX) + pos.X); | 2118 | int X = (int)((m_scene.RegionInfo.WorldLocX) + pos.X); |
2119 | int Y = (int)((m_scene.RegionInfo.RegionWorldLocY) + pos.Y); | 2119 | int Y = (int)((m_scene.RegionInfo.WorldLocY) + pos.Y); |
2120 | GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y); | 2120 | GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y); |
2121 | // If X and Y is NaN, target_region will be null | 2121 | // If X and Y is NaN, target_region will be null |
2122 | if (target_region == null) | 2122 | if (target_region == null) |