diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/llworldmap.cpp | 4 | ||||
-rw-r--r-- | linden/indra/newview/llworldmapview.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp index bd3996d..608d720 100644 --- a/linden/indra/newview/llworldmap.cpp +++ b/linden/indra/newview/llworldmap.cpp | |||
@@ -81,7 +81,9 @@ LLSimInfo::LLSimInfo() | |||
81 | mAccess(0x0), | 81 | mAccess(0x0), |
82 | mRegionFlags(0x0), | 82 | mRegionFlags(0x0), |
83 | mWaterHeight(0.f), | 83 | mWaterHeight(0.f), |
84 | mAlpha(-1.f) | 84 | mAlpha(-1.f), |
85 | msizeX(REGION_WIDTH_UNITS), | ||
86 | msizeY(REGION_WIDTH_UNITS) | ||
85 | { | 87 | { |
86 | } | 88 | } |
87 | 89 | ||
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp index 8d9ed1b..d7a6838 100644 --- a/linden/indra/newview/llworldmapview.cpp +++ b/linden/indra/newview/llworldmapview.cpp | |||
@@ -472,7 +472,7 @@ void LLWorldMapView::draw() | |||
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->msizeX / 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 |