diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-04-29 23:01:07 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-04-29 23:01:07 +0300 |
| commit | 503605641a6285064765b6057dbad67df84140e2 (patch) | |
| tree | 6bffee2c5b77e674aa2133e4299f2722eadc9ff3 | |
| parent | d2c9543a19fa4ed008bbda841885bd1f34c289a0 (diff) | |
CHUI-956 FIXED Vertical scrollbar in conversation list not scrolls off bottom
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_container.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index a3a0093346..1bb2ce01e4 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -206,6 +206,7 @@ BOOL LLFloaterIMContainer::postBuild() // a scroller for folder view LLRect scroller_view_rect = mConversationsListPanel->getRect(); scroller_view_rect.translate(-scroller_view_rect.mLeft, -scroller_view_rect.mBottom); + scroller_view_rect.mBottom += getChild<LLLayoutStack>("conversations_pane_buttons_stack")->getRect().getHeight(); LLScrollContainer::Params scroller_params(LLUICtrlFactory::getDefaultParams<LLFolderViewScrollContainer>()); scroller_params.rect(scroller_view_rect); diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index 2d605bc010..da016462db 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -24,7 +24,7 @@ value="Conv_toolbar_expand"/> <layout_stack animate="true" - bottom="-1" + bottom="-5" drag_handle_gap="6" drag_handle_first_indent="27" drag_handle_second_indent="10" |