diff options
| author | UbitUmarov | 2016-12-02 13:51:30 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-02 13:51:30 +0000 |
| commit | b981ac42bc0f5ad305068bb2f6f2215010b96990 (patch) | |
| tree | 99e1625f37c4d144e6076b9bfb9a443d7281cbec /OpenSim/Data/MySQL/MySQLRegionData.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | do a GC collect on last client exit (diff) | |
| download | opensim-SC-b981ac42bc0f5ad305068bb2f6f2215010b96990.zip opensim-SC-b981ac42bc0f5ad305068bb2f6f2215010b96990.tar.gz opensim-SC-b981ac42bc0f5ad305068bb2f6f2215010b96990.tar.bz2 opensim-SC-b981ac42bc0f5ad305068bb2f6f2215010b96990.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index 3dc049b..99d4944 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs | |||
| @@ -204,7 +204,7 @@ namespace OpenSim.Data.MySQL | |||
| 204 | foreach (RegionData r in dbret) | 204 | foreach (RegionData r in dbret) |
| 205 | { | 205 | { |
| 206 | if (r.posX + r.sizeX > startX && r.posX <= endX | 206 | if (r.posX + r.sizeX > startX && r.posX <= endX |
| 207 | && r.posY + r.sizeX > startY && r.posY <= endY) | 207 | && r.posY + r.sizeY > startY && r.posY <= endY) |
| 208 | ret.Add(r); | 208 | ret.Add(r); |
| 209 | } | 209 | } |
| 210 | return ret; | 210 | return ret; |