diff options
author | Jacek Antonelli | 2011-03-18 21:05:23 -0500 |
---|---|---|
committer | Jacek Antonelli | 2011-03-18 21:50:25 -0500 |
commit | e67e3f216fdb0868d05c35f105dd83c5358dd3b0 (patch) | |
tree | 4de6be204ab09d635c1e4ca2215abd2c17ae6671 /linden/indra/newview/llworldmapview.cpp | |
parent | Fix a bug that only occurs when not running in a debugger. (diff) | |
download | meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.zip meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.gz meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.bz2 meta-impy-e67e3f216fdb0868d05c35f105dd83c5358dd3b0.tar.xz |
Fixed bad line endings (CRLF) in many files.
Windows users, please set "autocrlf = input" or "autocrlf = true" in
your .git/config [core] section to avoid this in the future.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llworldmapview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp index 51de598..8d9ed1b 100644 --- a/linden/indra/newview/llworldmapview.cpp +++ b/linden/indra/newview/llworldmapview.cpp | |||
@@ -471,8 +471,8 @@ void LLWorldMapView::draw() | |||
471 | // When the view isn't panned, 0,0 = center of rectangle | 471 | // When the view isn't panned, 0,0 = center of rectangle |
472 | F32 bottom = sPanY + half_height + relative_y; | 472 | F32 bottom = sPanY + half_height + relative_y; |
473 | F32 left = sPanX + half_width + relative_x; | 473 | F32 left = sPanX + half_width + relative_x; |
474 | F32 top = bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS); | 474 | F32 top = bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS); |
475 | F32 right = left + (sMapScale * info->msizeY / REGION_WIDTH_METERS); | 475 | F32 right = left + (sMapScale * info->msizeY / REGION_WIDTH_METERS); |
476 | 476 | ||
477 | // Switch to world map texture (if available for this region) if either: | 477 | // Switch to world map texture (if available for this region) if either: |
478 | // 1. Tiles are zoomed out small enough, or | 478 | // 1. Tiles are zoomed out small enough, or |
@@ -567,11 +567,11 @@ void LLWorldMapView::draw() | |||
567 | center_global.mdV[VX] += 128.0; | 567 | center_global.mdV[VX] += 128.0; |
568 | center_global.mdV[VY] += 128.0; | 568 | center_global.mdV[VY] += 128.0; |
569 | 569 | ||
570 | S32 x_draw_size = llround(sMapScale); | 570 | S32 x_draw_size = llround(sMapScale); |
571 | S32 y_draw_size = llround(sMapScale); | 571 | S32 y_draw_size = llround(sMapScale); |
572 | x_draw_size *= info->msizeX / REGION_WIDTH_METERS; | 572 | x_draw_size *= info->msizeX / REGION_WIDTH_METERS; |
573 | y_draw_size *= info->msizeY / REGION_WIDTH_METERS; | 573 | y_draw_size *= info->msizeY / REGION_WIDTH_METERS; |
574 | 574 | ||
575 | if (simimage != NULL) | 575 | if (simimage != NULL) |
576 | { | 576 | { |
577 | simimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP); | 577 | simimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP); |