diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2022-03-09 14:58:31 -0800 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2022-04-05 11:55:34 -0700 |
| commit | 288fbe23175d504359169ae6d8dda86529f8d046 (patch) | |
| tree | 555a12ebfc5843066a96a13be83d0bcf14513922 /indra/newview | |
| parent | d3a616122f46dc1100bf9ef751b8530a94aa3799 (diff) | |
SL-15232: Fix top/right edges of main map not being scrollable
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterworldmap.cpp | 6 |
1 files 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<LLUICtrl>("zoom slider")->getValue().asReal(); F32 slider_zoom = old_slider_zoom + ((F32)clicks * -0.3333f); getChild<LLUICtrl>("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; } |