From c0b31fcc3e16436ded72c4d36eb5a0d704fa7b8d Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 19 Oct 2009 10:33:38 -0700 Subject: Clamp map teleporting at 4096 rather than 1000 --- ChangeLog.txt | 5 +++++ linden/indra/newview/llfloaterworldmap.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index fbdabd6..89920a8 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2009-10-19 McCabe Maxsted + * Clamp map teleporting at 4096 rather than 1000. + + modified: linden/indra/newview/llfloaterworldmap.cpp + + * Applied rlva_init-imprudence.patch (fixes RLVa not initializing in 1.2). 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() void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord) { LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name); - z_coord = llclamp(z_coord, 0, 1000); + z_coord = llclamp(z_coord, 0, 4096); if (sim_info) { LLVector3 local_pos; -- cgit v1.1