diff options
| author | UbitUmarov | 2019-05-02 03:11:16 +0100 |
|---|---|---|
| committer | UbitUmarov | 2019-05-02 03:11:16 +0100 |
| commit | 3a055c578d9fb2e1f6c0c9ba47a7b8c9c5d8af48 (patch) | |
| tree | 233a28a4846b7fc45eb7375d2565bdac4eff8efa /OpenSim/Region/Framework | |
| parent | osLocalTeleportAgent: no region crossings :( ; check avatar access to target ... (diff) | |
| download | opensim-SC-3a055c578d9fb2e1f6c0c9ba47a7b8c9c5d8af48.zip opensim-SC-3a055c578d9fb2e1f6c0c9ba47a7b8c9c5d8af48.tar.gz opensim-SC-3a055c578d9fb2e1f6c0c9ba47a7b8c9c5d8af48.tar.bz2 opensim-SC-3a055c578d9fb2e1f6c0c9ba47a7b8c9c5d8af48.tar.xz | |
soem cleanup
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cd2b9b4..b12bb45 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1769,19 +1769,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1769 | 1769 | ||
| 1770 | float localHalfAVHeight = 0.8f; | 1770 | float localHalfAVHeight = 0.8f; |
| 1771 | if (Appearance != null) | 1771 | if (Appearance != null) |
| 1772 | localHalfAVHeight = Appearance.AvatarHeight / 2; | 1772 | localHalfAVHeight = Appearance.AvatarHeight * 0.5f; |
| 1773 | |||
| 1774 | float posZLimit = 22; | ||
| 1775 | |||
| 1776 | // TODO: Check other Scene HeightField | ||
| 1777 | posZLimit = (float)Scene.Heightmap[(int)newpos.X, (int)newpos.Y]; | ||
| 1778 | 1773 | ||
| 1774 | float posZLimit = (float)Scene.Heightmap[(int)newpos.X, (int)newpos.Y]; | ||
| 1779 | posZLimit += localHalfAVHeight + 0.1f; | 1775 | posZLimit += localHalfAVHeight + 0.1f; |
| 1780 | 1776 | if (newpos.Z < posZLimit) | |
| 1781 | if ((newpos.Z < posZLimit) && !(Single.IsInfinity(posZLimit) || Single.IsNaN(posZLimit))) | ||
| 1782 | { | ||
| 1783 | newpos.Z = posZLimit; | 1777 | newpos.Z = posZLimit; |
| 1784 | } | ||
| 1785 | 1778 | ||
| 1786 | if ((flags & 8) != 0) | 1779 | if ((flags & 8) != 0) |
| 1787 | Flying = true; | 1780 | Flying = true; |