From 288fbe23175d504359169ae6d8dda86529f8d046 Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Wed, 9 Mar 2022 14:58:31 -0800 Subject: SL-15232: Fix top/right edges of main map not being scrollable --- indra/newview/llfloaterworldmap.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 6e29a01dd1..2947804b69 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -405,13 +405,13 @@ BOOL LLFloaterWorldMap::handleScrollWheel(S32 x, S32 y, S32 clicks) { if (!isMinimized() && isFrontmost()) { - if (mPanel->pointInView(x, y)) + S32 map_x = x - mPanel->getRect().mLeft; + S32 map_y = y - mPanel->getRect().mBottom; + if (mPanel->pointInView(map_x, map_y)) { F32 old_slider_zoom = (F32)getChild("zoom slider")->getValue().asReal(); F32 slider_zoom = old_slider_zoom + ((F32)clicks * -0.3333f); getChild("zoom slider")->setValue(LLSD(slider_zoom)); - S32 map_x = x - mPanel->getRect().mLeft; - S32 map_y = y - mPanel->getRect().mBottom; LLWorldMapView::zoomWithPivot(slider_zoom, map_x, map_y); return true; } -- cgit v1.2.3