diff options
| author | Robert Adams | 2013-10-02 16:57:02 -0700 |
|---|---|---|
| committer | Robert Adams | 2013-10-07 13:57:30 -0700 |
| commit | 25ae59b9ebf71d39d2ff5237b791f2599f4fa082 (patch) | |
| tree | 2a7a96da851cc236e1c5842301d08ed852c24f65 /OpenSim/Region/Framework/Scenes | |
| parent | varregion: add new TerrainData and TerrainCompressor routines. TerrainCompres... (diff) | |
| download | opensim-SC_OLD-25ae59b9ebf71d39d2ff5237b791f2599f4fa082.zip opensim-SC_OLD-25ae59b9ebf71d39d2ff5237b791f2599f4fa082.tar.gz opensim-SC_OLD-25ae59b9ebf71d39d2ff5237b791f2599f4fa082.tar.bz2 opensim-SC_OLD-25ae59b9ebf71d39d2ff5237b791f2599f4fa082.tar.xz | |
varregion: remove scattered use of Constants.RegionSize by having routines reference RegionInfo.RegionWorldLoc?.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7ef144c..297ee5f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2094,8 +2094,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2094 | // } | 2094 | // } |
| 2095 | 2095 | ||
| 2096 | // Get terrain height for sub-region in a megaregion if necessary | 2096 | // Get terrain height for sub-region in a megaregion if necessary |
| 2097 | int X = (int)((m_scene.RegionInfo.LegacyRegionLocX * Constants.RegionSize) + pos.X); | 2097 | int X = (int)((m_scene.RegionInfo.RegionWorldLocX) + pos.X); |
| 2098 | int Y = (int)((m_scene.RegionInfo.LegacyRegionLocY * Constants.RegionSize) + pos.Y); | 2098 | int Y = (int)((m_scene.RegionInfo.RegionWorldLocY) + pos.Y); |
| 2099 | GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y); | 2099 | GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y); |
| 2100 | // If X and Y is NaN, target_region will be null | 2100 | // If X and Y is NaN, target_region will be null |
| 2101 | if (target_region == null) | 2101 | if (target_region == null) |