diff options
| author | UbitUmarov | 2015-11-25 04:13:13 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-25 04:13:13 +0000 |
| commit | 172bb05ec257b1abb3554eeb6c5b8bcbdae89b78 (patch) | |
| tree | c30e0d54a4ff412102f1d9bdba114e3176630944 /OpenSim/Framework | |
| parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-172bb05ec257b1abb3554eeb6c5b8bcbdae89b78.zip opensim-SC_OLD-172bb05ec257b1abb3554eeb6c5b8bcbdae89b78.tar.gz opensim-SC_OLD-172bb05ec257b1abb3554eeb6c5b8bcbdae89b78.tar.bz2 opensim-SC_OLD-172bb05ec257b1abb3554eeb6c5b8bcbdae89b78.tar.xz | |
suspend the use of DisableSimulator, that is causing teleport and crossing issues
Diffstat (limited to 'OpenSim/Framework')
| -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; |