diff options
| author | Diva Canto | 2015-11-27 08:24:39 -0800 |
|---|---|---|
| committer | Diva Canto | 2015-11-27 08:24:39 -0800 |
| commit | cade717b5ffd0445c6246a55da5e80da2562450d (patch) | |
| tree | 4e0a182d64905d35524336ee93b1283385494447 /OpenSim/Framework/Util.cs | |
| parent | Sometimes the viewer sends a null string as mapName; this made the client thr... (diff) | |
| parent | add a delay to consume other change messages on move and cross (diff) | |
| download | opensim-SC_OLD-cade717b5ffd0445c6246a55da5e80da2562450d.zip opensim-SC_OLD-cade717b5ffd0445c6246a55da5e80da2562450d.tar.gz opensim-SC_OLD-cade717b5ffd0445c6246a55da5e80da2562450d.tar.bz2 opensim-SC_OLD-cade717b5ffd0445c6246a55da5e80da2562450d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Util.cs')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 4dafaef..4aad578 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -753,7 +753,7 @@ namespace OpenSim.Framework | |||
| 753 | newy *= Constants.RegionSize; | 753 | newy *= Constants.RegionSize; |
| 754 | if (oldy + oldsizey + drawdist < newy) | 754 | if (oldy + oldsizey + drawdist < newy) |
| 755 | return true; | 755 | return true; |
| 756 | if (newy + newsizey + drawdist< oldy) | 756 | if (newy + newsizey + drawdist < oldy) |
| 757 | return true; | 757 | return true; |
| 758 | 758 | ||
| 759 | return false; | 759 | return false; |