diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-10-28 18:00:39 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-10-28 18:00:39 -0700 |
| commit | 6a9de7c8ee7d3be289fbd42741a327d42b6ea9eb (patch) | |
| tree | 1ab3e0536fef2b2ee50ba48decec07ad91eb2e1e /indra | |
| parent | 437449044583d50c8cad694e65e5a4a23a55d768 (diff) | |
merge fix
Diffstat (limited to 'indra')
| -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 08f16a12d4..cde4c75518 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.isProvided() ? p.font() : (mIsVertical ? LLFontGL::getFontSansSerif() : LLFontGL::getFontSansSerifSmall())), mFirstTabParams(p.first_tab), mMiddleTabParams(p.middle_tab), mLastTabParams(p.last_tab) |