diff options
author | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
---|---|---|
committer | RunitaiLinden <davep@lindenlab.com> | 2023-07-18 12:18:35 -0500 |
commit | 5797711cbdb553b39e6bc6ad7d9250e3208e5633 (patch) | |
tree | 5071e15e3240c3e39fe42a26f4c45bd63ccb381a /indra/newview/llpanelobjectinventory.cpp | |
parent | a0089c432ac9008f5d2f7ef2a332afa10c5a2615 (diff) | |
parent | f9f5b538b21ae57f34009b36d4831d2a7000c20c (diff) |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
-rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 2db8620d2d..3f8ed30d62 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1427,7 +1427,8 @@ void LLPanelObjectInventory::reset() LLEditMenuHandler::gEditMenuHandler = mFolders; } - LLRect scroller_rect(0, getRect().getHeight(), getRect().getWidth(), 0); + int offset = hasBorder() ? getBorder()->getBorderWidth() << 1 : 0; + LLRect scroller_rect(0, getRect().getHeight() - offset, getRect().getWidth() - offset, 0); LLScrollContainer::Params scroll_p; scroll_p.name("task inventory scroller"); scroll_p.rect(scroller_rect); |