From 37373dbde2cc01393be439599673739ee4fed6e0 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 6 Jun 2008 13:33:45 +0000
Subject: * true and not true or - not true and not true and.

---
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment')

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
             m_isChildAgent = false;
             float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y);
             float newPosZ = posZLimit + m_avHeight;
-            if (posZLimit >= (pos.Z -(m_avHeight/2)) && !(Single.IsInfinity(newPosZ) && Single.IsNaN(newPosZ)))
+            if (posZLimit >= (pos.Z -(m_avHeight/2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
             {
                 pos.Z = newPosZ;
             }
-- 
cgit v1.1