diff options
| author | McCabe Maxsted | 2010-06-24 03:12:54 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-26 19:01:37 -0500 |
| commit | 588a4bff4011014e641febe46dd338f887308d3d (patch) | |
| tree | a85293d130f3b2eb703a5e26348e4b9e2d9239f4 /linden/indra/newview/llfloaterworldmap.cpp | |
| parent | Fixed memory leak in llimage/llimagepng.cpp (backported from SL 2.0) (diff) | |
| download | meta-impy-588a4bff4011014e641febe46dd338f887308d3d.zip meta-impy-588a4bff4011014e641febe46dd338f887308d3d.tar.gz meta-impy-588a4bff4011014e641febe46dd338f887308d3d.tar.bz2 meta-impy-588a4bff4011014e641febe46dd338f887308d3d.tar.xz | |
Fixed template warning for datatypes
Diffstat (limited to 'linden/indra/newview/llfloaterworldmap.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterworldmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp index c1945cf..4f678c5 100644 --- a/linden/indra/newview/llfloaterworldmap.cpp +++ b/linden/indra/newview/llfloaterworldmap.cpp | |||
| @@ -781,7 +781,7 @@ void LLFloaterWorldMap::updateLocation() | |||
| 781 | void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord) | 781 | void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord) |
| 782 | { | 782 | { |
| 783 | LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name); | 783 | LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name); |
| 784 | z_coord = llclamp(z_coord, 0, gHippoLimits->getMaxHeight()); | 784 | z_coord = llclamp(z_coord, 0, (S32)gHippoLimits->getMaxHeight()); |
| 785 | if (sim_info) | 785 | if (sim_info) |
| 786 | { | 786 | { |
| 787 | LLVector3 local_pos; | 787 | LLVector3 local_pos; |