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/Hypergrid | |
| parent | * refactor: move media and music url setting from scene into LandObject (diff) | |
| download | opensim-SC-11e1948b57f96e7d22c56e82bfb15b93f62a5cef.zip opensim-SC-11e1948b57f96e7d22c56e82bfb15b93f62a5cef.tar.gz opensim-SC-11e1948b57f96e7d22c56e82bfb15b93f62a5cef.tar.bz2 opensim-SC-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/Hypergrid')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index 67cc1a1..edd1804 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
| @@ -88,7 +88,8 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
| 88 | } | 88 | } |
| 89 | // TODO: Get proper AVG Height | 89 | // TODO: Get proper AVG Height |
| 90 | float localAVHeight = 1.56f; | 90 | float localAVHeight = 1.56f; |
| 91 | float posZLimit = (float)avatar.Scene.GetLandHeight((int)position.X, (int)position.Y); | 91 | |
| 92 | float posZLimit = (float)avatar.Scene.Heightmap[(int)position.X, (int)position.Y]; | ||
| 92 | float newPosZ = posZLimit + localAVHeight; | 93 | float newPosZ = posZLimit + localAVHeight; |
| 93 | if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) | 94 | if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) |
| 94 | { | 95 | { |