diff options
author | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 21:32:53 -0500 |
---|---|---|
committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 21:32:53 -0500 |
commit | 6704b1ea7ff97cbeaca4e4a2a049c9581fb9a573 (patch) | |
tree | 7dc425220f12a86263117772f09c75db37d84abf /indra/llui/lltabcontainer.cpp | |
parent | e0249da7fd8af278b286b444da96fd2b5a54354e (diff) | |
parent | a226668381ce7866f28ff78884d73b9738a91c23 (diff) |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
-rw-r--r-- | indra/llui/lltabcontainer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index e810b6fe8f..9a715cca0b 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -214,7 +214,8 @@ LLTabContainer::Params::Params() last_tab("last_tab"), use_custom_icon_ctrl("use_custom_icon_ctrl", false), tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0), - use_ellipses("use_ellipses") + use_ellipses("use_ellipses"), + font_halign("font_halign") { name(std::string("tab_container")); mouse_opaque = false; |