diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-20 20:13:47 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-20 20:13:47 -0700 |
| commit | 9652de51ce5a64136b66c04461b12005568bd5f1 (patch) | |
| tree | e10b5fe356833b4027a55e8762efdbb605003c6e /indra | |
| parent | a0417239ab34e1671e8d77009305f45e19f6bed7 (diff) | |
| parent | e44b548704d8dbdaea59ceaea08015499a2bf623 (diff) | |
STORM-281 : merge to viewer-development + fix indentation
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 0c17b5e297..8ef3a3b839 100644 --- a/indra/newview/llworldmapview.cpp +++ b/indra/newview/llworldmapview.cpp @@ -880,8 +880,10 @@ void LLWorldMapView::drawFrustum() F32 half_width_meters = far_clip_meters * tan( horiz_fov / 2 ); F32 half_width_pixels = half_width_meters * meters_to_pixels; - F32 ctr_x = getLocalRect().getWidth() * 0.5f + sPanX; - F32 ctr_y = getLocalRect().getHeight() * 0.5f + sPanY; + // Compute the frustum coordinates. Take the UI scale into account. + F32 ui_scale_factor = gSavedSettings.getF32("UIScaleFactor"); + F32 ctr_x = (getLocalRect().getWidth() * 0.5f + sPanX) * ui_scale_factor; + F32 ctr_y = (getLocalRect().getHeight() * 0.5f + sPanY) * ui_scale_factor; gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |