aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-06 14:33:01 +0000
committerTeravus Ovares2008-06-06 14:33:01 +0000
commite099d5b013610df0e2288e66a14cd7ad361ee480 (patch)
tree3f72c608dcb6b77a9e1bafedae9c9991329d1845
parent* true and not true or - not true and not true and. (diff)
downloadopensim-SC_OLD-e099d5b013610df0e2288e66a14cd7ad361ee480.zip
opensim-SC_OLD-e099d5b013610df0e2288e66a14cd7ad361ee480.tar.gz
opensim-SC_OLD-e099d5b013610df0e2288e66a14cd7ad361ee480.tar.bz2
opensim-SC_OLD-e099d5b013610df0e2288e66a14cd7ad361ee480.tar.xz
* How tall are you? Certainly not 127 meters!
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index ec3137f..99b2085 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -592,9 +592,16 @@ namespace OpenSim.Region.Environment.Scenes
592// Name, UUID, m_scene.RegionInfo.RegionName); 592// Name, UUID, m_scene.RegionInfo.RegionName);
593 593
594 m_isChildAgent = false; 594 m_isChildAgent = false;
595
596 float localAVHeight = 1.56f;
597 if (m_avHeight != 127.0f)
598 {
599 localAVHeight = m_avHeight;
600 }
601
595 float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y); 602 float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y);
596 float newPosZ = posZLimit + m_avHeight; 603 float newPosZ = posZLimit + localAVHeight;
597 if (posZLimit >= (pos.Z -(m_avHeight/2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ))) 604 if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
598 { 605 {
599 pos.Z = newPosZ; 606 pos.Z = newPosZ;
600 } 607 }