diff options
| author | Teravus Ovares | 2008-06-06 13:33:45 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-06-06 13:33:45 +0000 |
| commit | 37373dbde2cc01393be439599673739ee4fed6e0 (patch) | |
| tree | 1d00c98439adf79f0bc8e0771080f79e2c49d149 /OpenSim/Region/Environment | |
| parent | * This limits avatar to the heightfield height if they teleport or cross a bo... (diff) | |
| download | opensim-SC-37373dbde2cc01393be439599673739ee4fed6e0.zip opensim-SC-37373dbde2cc01393be439599673739ee4fed6e0.tar.gz opensim-SC-37373dbde2cc01393be439599673739ee4fed6e0.tar.bz2 opensim-SC-37373dbde2cc01393be439599673739ee4fed6e0.tar.xz | |
* true and not true or - not true and not true and.
Diffstat (limited to 'OpenSim/Region/Environment')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 2215850..ec3137f 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
| @@ -594,7 +594,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 594 | m_isChildAgent = false; | 594 | m_isChildAgent = false; |
| 595 | float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y); | 595 | float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y); |
| 596 | float newPosZ = posZLimit + m_avHeight; | 596 | float newPosZ = posZLimit + m_avHeight; |
| 597 | if (posZLimit >= (pos.Z -(m_avHeight/2)) && !(Single.IsInfinity(newPosZ) && Single.IsNaN(newPosZ))) | 597 | if (posZLimit >= (pos.Z -(m_avHeight/2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) |
| 598 | { | 598 | { |
| 599 | pos.Z = newPosZ; | 599 | pos.Z = newPosZ; |
| 600 | } | 600 | } |