From e44b548704d8dbdaea59ceaea08015499a2bf623 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 19 Oct 2010 17:48:35 -0700
Subject: [PATCH] STORM-281 : Fix Map FOV frustum when UI size not equal to 1
---
doc/contributions.txt | 2 ++
indra/newview/llworldmapview.cpp | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index bcf714b29a7..46dc2c0070c 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 0c17b5e297c..620c8fe82d5 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);
--
GitLab