diff options
| author | UbitUmarov | 2015-08-23 04:48:44 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-08-23 04:48:44 +0100 |
| commit | 7f0201ffcaf6191ad25eac9288609e2cfa5c4e80 (patch) | |
| tree | 0b5af221a06aecb8c8faa3f7bedca92e73bbb5e1 /OpenSim/Data | |
| parent | more fixes on map (diff) | |
| download | opensim-SC_OLD-7f0201ffcaf6191ad25eac9288609e2cfa5c4e80.zip opensim-SC_OLD-7f0201ffcaf6191ad25eac9288609e2cfa5c4e80.tar.gz opensim-SC_OLD-7f0201ffcaf6191ad25eac9288609e2cfa5c4e80.tar.bz2 opensim-SC_OLD-7f0201ffcaf6191ad25eac9288609e2cfa5c4e80.tar.xz | |
fix region range compare
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/Null/NullRegionData.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs index d28cd99..3e69394 100644 --- a/OpenSim/Data/Null/NullRegionData.cs +++ b/OpenSim/Data/Null/NullRegionData.cs | |||
| @@ -140,7 +140,8 @@ namespace OpenSim.Data.Null | |||
| 140 | { | 140 | { |
| 141 | foreach (RegionData r in m_regionData.Values) | 141 | foreach (RegionData r in m_regionData.Values) |
| 142 | { | 142 | { |
| 143 | if (r.posX == posX && r.posY == posY) | 143 | if (posX >= r.posX && posX < r.posX + r.sizeX |
| 144 | && posY >= r.posY && posY < r.posY + r.sizeY) | ||
| 144 | ret.Add(r); | 145 | ret.Add(r); |
| 145 | } | 146 | } |
| 146 | } | 147 | } |
| @@ -176,8 +177,9 @@ namespace OpenSim.Data.Null | |||
| 176 | { | 177 | { |
| 177 | foreach (RegionData r in m_regionData.Values) | 178 | foreach (RegionData r in m_regionData.Values) |
| 178 | { | 179 | { |
| 179 | if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY) | 180 | if (r.posX + r.sizeX > startX && r.posX <= endX |
| 180 | ret.Add(r); | 181 | && r.posY + r.sizeX > startY && r.posY <= endY) |
| 182 | ret.Add(r); | ||
| 181 | } | 183 | } |
| 182 | } | 184 | } |
| 183 | 185 | ||