diff options
author | Robert Adams | 2013-09-19 12:14:21 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-25 17:30:45 -0700 |
commit | 96abbbb6fbab56e29c8a8af6974ef1df90e45ddf (patch) | |
tree | a077759f6c3563ef86c13f7a06fae549f4577b4b /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | minor: Comment out windlight log message about sending scene data for now. (diff) | |
download | opensim-SC-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.zip opensim-SC-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.gz opensim-SC-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.bz2 opensim-SC-96abbbb6fbab56e29c8a8af6974ef1df90e45ddf.tar.xz |
VarRegion: change RegionInfo storage of region coordinates from region
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-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 7243db1..7ef144c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -710,7 +710,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
710 | Utils.LongToUInts(handle, out x, out y); | 710 | Utils.LongToUInts(handle, out x, out y); |
711 | x = x / Constants.RegionSize; | 711 | x = x / Constants.RegionSize; |
712 | y = y / Constants.RegionSize; | 712 | y = y / Constants.RegionSize; |
713 | if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.RegionLocX, y, Scene.RegionInfo.RegionLocY)) | 713 | if (Util.IsOutsideView(DrawDistance, x, Scene.RegionInfo.LegacyRegionLocX, y, Scene.RegionInfo.LegacyRegionLocY)) |
714 | { | 714 | { |
715 | old.Add(handle); | 715 | old.Add(handle); |
716 | } | 716 | } |
@@ -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.RegionLocX * Constants.RegionSize) + pos.X); | 2097 | int X = (int)((m_scene.RegionInfo.LegacyRegionLocX * Constants.RegionSize) + pos.X); |
2098 | int Y = (int)((m_scene.RegionInfo.RegionLocY * Constants.RegionSize) + pos.Y); | 2098 | int Y = (int)((m_scene.RegionInfo.LegacyRegionLocY * Constants.RegionSize) + 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) |