diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-15 17:14:31 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-15 17:14:31 +0200 |
| commit | e303864c1792a69d25f42b9bc44bc59827cfdbd1 (patch) | |
| tree | cd176a6303c0c9786ee4be729b1f09a831865065 /indra/llui/lltabcontainer.cpp | |
| parent | 40fa0368919da7b4f3c105c6bdf3a497ac29c360 (diff) | |
| parent | d82f82d7965ec9360cb49ec7e6c1c2f984d4539b (diff) | |
Merge from default branch.
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.
--HG--
branch : product-engine
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 d7d61cf6cb..2d9106923e 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -906,7 +906,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel) if (placeholder) { - btn_rect.translate(0, -LLBUTTON_V_PAD-2); + btn_rect.translate(0, -3); // *TODO: make configurable LLTextBox::Params params; params.name(trimmed_label); params.rect(btn_rect); |