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/SceneCommunicationService.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/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index c3b60f8..28ea8b0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -710,7 +710,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 710 | 710 | ||
| 711 | // TODO: Get proper AVG Height | 711 | // TODO: Get proper AVG Height |
| 712 | float localAVHeight = 1.56f; | 712 | float localAVHeight = 1.56f; |
| 713 | float posZLimit = (float)avatar.Scene.GetLandHeight((int)position.X, (int)position.Y); | 713 | float posZLimit = (float)avatar.Scene.Heightmap[(int)position.X, (int)position.Y]; |
| 714 | float newPosZ = posZLimit + localAVHeight; | 714 | float newPosZ = posZLimit + localAVHeight; |
| 715 | if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) | 715 | if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) |
| 716 | { | 716 | { |