aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorunknown2008-12-24 06:07:18 -0700
committerunknown2008-12-24 06:07:18 -0700
commit0255b20ddba7b0e1c56be987c0d902b73da06cdd (patch)
tree6df40a5d89bc3a7fee6b4fa598dbd83c6e660539
parent1.1 wip copy (diff)
downloadmeta-impy-0255b20ddba7b0e1c56be987c0d902b73da06cdd.zip
meta-impy-0255b20ddba7b0e1c56be987c0d902b73da06cdd.tar.gz
meta-impy-0255b20ddba7b0e1c56be987c0d902b73da06cdd.tar.bz2
meta-impy-0255b20ddba7b0e1c56be987c0d902b73da06cdd.tar.xz
llMapDestination and map floater can now tp up to 4096m
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/newview/llfloaterworldmap.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index a554e0a..0e3959c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
12008-12-24 McCabe Maxsted <hakushakukun@gmail.com>
2
3 * linden/indra/newview/llfloaterworldmap.cpp:
4 llMapDestination and map floater can now tp up to 4096m.
5
6
12008-12-15 Jacek Antonelli <jacek.antonelli@gmail.com> 72008-12-15 Jacek Antonelli <jacek.antonelli@gmail.com>
2 8
3 * linden/install.xml: 9 * linden/install.xml:
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index b56bfcb..8396454 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -743,7 +743,7 @@ void LLFloaterWorldMap::updateLocation()
743void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord) 743void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
744{ 744{
745 LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name); 745 LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
746 z_coord = llclamp(z_coord, 0, 1000); 746 z_coord = llclamp(z_coord, 0, 4096);
747 if (sim_info) 747 if (sim_info)
748 { 748 {
749 LLVector3 local_pos; 749 LLVector3 local_pos;