aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llfloaterworldmap.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index fbdabd6..89920a8 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
12009-10-19 McCabe Maxsted <hakushakukun@gmail.com> 12009-10-19 McCabe Maxsted <hakushakukun@gmail.com>
2 2
3 * Clamp map teleporting at 4096 rather than 1000.
4
5 modified: linden/indra/newview/llfloaterworldmap.cpp
6
7
3 * Applied rlva_init-imprudence.patch (fixes RLVa not initializing in 1.2). 8 * Applied rlva_init-imprudence.patch (fixes RLVa not initializing in 1.2).
4 9
5 modified: linden/indra/newview/llappviewer.cpp 10 modified: linden/indra/newview/llappviewer.cpp
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 70223c9..028ebf2 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -770,7 +770,7 @@ void LLFloaterWorldMap::updateLocation()
770void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord) 770void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
771{ 771{
772 LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name); 772 LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
773 z_coord = llclamp(z_coord, 0, 1000); 773 z_coord = llclamp(z_coord, 0, 4096);
774 if (sim_info) 774 if (sim_info)
775 { 775 {
776 LLVector3 local_pos; 776 LLVector3 local_pos;