diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-19 17:48:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-19 17:48:35 -0700 |
| commit | e44b548704d8dbdaea59ceaea08015499a2bf623 (patch) | |
| tree | 73dd097284757594cb4cd6efc1175a8adb52ec49 | |
| parent | 04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff) | |
STORM-281 : Fix Map FOV frustum when UI size not equal to 1
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index bcf714b29a..46dc2c0070 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -381,6 +381,8 @@ Malwina Dollinger CT-138 march Korda SVC-1020 +Marine Kelley + STORM-281 Matthew Dowd VWR-1344 VWR-1651 diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp index 0c17b5e297..620c8fe82d 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); |