diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-04 15:09:57 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-04 15:09:57 -0800 |
| commit | 0e63920569302a4f6afcbc0feb28ff379e4a4bac (patch) | |
| tree | 599838d400e696beb60946ec57ed8225a2b1b97d /indra/llui/lltabcontainer.cpp | |
| parent | 26d81f656ab358c8089da4b0e4e558ac2c4374b9 (diff) | |
| parent | 0520ad677a380e81f6d166bfbcbed23333533b77 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 6073b54371..b67f753d39 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -155,7 +155,7 @@ LLTabContainer::LLTabContainer(const LLTabContainer::Params& p) mTotalTabWidth(0), mTabPosition(p.tab_position), mFontHalign(p.font_halign), - mFont(p.font.isProvided() ? p.font() : (mIsVertical ? LLFontGL::getFontSansSerif() : LLFontGL::getFontSansSerifSmall())), + mFont(p.font), mFirstTabParams(p.first_tab), mMiddleTabParams(p.middle_tab), mLastTabParams(p.last_tab) @@ -946,6 +946,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel) p.scale_image(true); p.font_halign = mFontHalign; p.tab_stop(false); + p.label_shadow(false); if (indent) { p.pad_left(indent); @@ -965,6 +966,7 @@ void LLTabContainer::addTabPanel(const TabPanelParams& panel) p.image_unselected(tab_img); p.image_selected(tab_selected_img); p.tab_stop(false); + p.label_shadow(false); // Try to squeeze in a bit more text p.pad_left(4); p.pad_right(2); |