diff options
| author | Justin Clarke Casey | 2009-03-05 21:10:39 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-03-05 21:10:39 +0000 |
| commit | 11e1948b57f96e7d22c56e82bfb15b93f62a5cef (patch) | |
| tree | 854a974e8a9870b7070c28b070f62557d98e13a5 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | * refactor: move media and music url setting from scene into LandObject (diff) | |
| download | opensim-SC_OLD-11e1948b57f96e7d22c56e82bfb15b93f62a5cef.zip opensim-SC_OLD-11e1948b57f96e7d22c56e82bfb15b93f62a5cef.tar.gz opensim-SC_OLD-11e1948b57f96e7d22c56e82bfb15b93f62a5cef.tar.bz2 opensim-SC_OLD-11e1948b57f96e7d22c56e82bfb15b93f62a5cef.tar.xz | |
* Replace Scene.GetLandHeight() with a straight query to Scene.Heightmap (which is used in other contexts)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6eb6ea4..67f6c29 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -848,7 +848,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 848 | localAVHeight = m_avHeight; | 848 | localAVHeight = m_avHeight; |
| 849 | } | 849 | } |
| 850 | 850 | ||
| 851 | float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y); | 851 | float posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y]; |
| 852 | float newPosZ = posZLimit + localAVHeight / 2; | 852 | float newPosZ = posZLimit + localAVHeight / 2; |
| 853 | if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) | 853 | if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) |
| 854 | { | 854 | { |