aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-23 20:46:07 -0700
committerJacek Antonelli2010-06-26 19:01:35 -0500
commitd94100f39c568bef7da7ce429cd3c3f20a903aee (patch)
treedb1686ca5ffb178018bdb686d8a98d5fec66826e /linden
parentFix for objects surviving kill region, ported from Emerald. (diff)
downloadmeta-impy-d94100f39c568bef7da7ce429cd3c3f20a903aee.zip
meta-impy-d94100f39c568bef7da7ce429cd3c3f20a903aee.tar.gz
meta-impy-d94100f39c568bef7da7ce429cd3c3f20a903aee.tar.bz2
meta-impy-d94100f39c568bef7da7ce429cd3c3f20a903aee.tar.xz
Allow map teleports up to the set grid height
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llfloaterworldmap.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index fbb90a9..c1945cf 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -70,6 +70,8 @@
70 70
71#include "llglheaders.h" 71#include "llglheaders.h"
72 72
73#include "hippoLimits.h"
74
73//--------------------------------------------------------------------------- 75//---------------------------------------------------------------------------
74// Constants 76// Constants
75//--------------------------------------------------------------------------- 77//---------------------------------------------------------------------------
@@ -779,7 +781,7 @@ void LLFloaterWorldMap::updateLocation()
779void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord) 781void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
780{ 782{
781 LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name); 783 LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
782 z_coord = llclamp(z_coord, 0, 4096); 784 z_coord = llclamp(z_coord, 0, gHippoLimits->getMaxHeight());
783 if (sim_info) 785 if (sim_info)
784 { 786 {
785 LLVector3 local_pos; 787 LLVector3 local_pos;