aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-06 13:33:45 +0000
committerTeravus Ovares2008-06-06 13:33:45 +0000
commit37373dbde2cc01393be439599673739ee4fed6e0 (patch)
tree1d00c98439adf79f0bc8e0771080f79e2c49d149 /OpenSim
parent* This limits avatar to the heightfield height if they teleport or cross a bo... (diff)
downloadopensim-SC_OLD-37373dbde2cc01393be439599673739ee4fed6e0.zip
opensim-SC_OLD-37373dbde2cc01393be439599673739ee4fed6e0.tar.gz
opensim-SC_OLD-37373dbde2cc01393be439599673739ee4fed6e0.tar.bz2
opensim-SC_OLD-37373dbde2cc01393be439599673739ee4fed6e0.tar.xz
* true and not true or - not true and not true and.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
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 }