diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 08:57:27 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 08:57:27 +0000 |
| commit | a7bca7055adbceee0fe09a6078158ffe8d0eacef (patch) | |
| tree | 4facac85effad80ad3d185794edc2ae90bddac1e /indra/llui/lltabcontainer.cpp | |
| parent | 245fe3edc6fa7333c16efcc90a4a52db8450a828 (diff) | |
| parent | 1d45b1edcd3570b27622c0e99cf0bd5aee331cc1 (diff) | |
PE merge. Conflict resolved.
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index cafb7c45f6..85ae13a889 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -955,7 +955,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel) LLRect tab_panel_rect; if (!getTabsHidden() && mIsVertical) { - tab_panel_rect = LLRect(mMinTabWidth + (LLPANEL_BORDER_WIDTH * 2) + tabcntrv_pad, + tab_panel_rect = LLRect(mMinTabWidth + mRightTabBtnOffset + (LLPANEL_BORDER_WIDTH * 2) + tabcntrv_pad, getRect().getHeight() - LLPANEL_BORDER_WIDTH, getRect().getWidth() - LLPANEL_BORDER_WIDTH, LLPANEL_BORDER_WIDTH); |