summaryrefslogtreecommitdiff
path: root/indra/llui/lltabcontainer.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-02-18 15:22:10 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-02-18 15:22:10 -0800
commit890ec637d41330a2a91d23b09b6aaaf49738d19a (patch)
treeb093f98112fb0cfdcad5452df1b266f1e0052fc0 /indra/llui/lltabcontainer.cpp
parent1d1e4c7abe5c46cfafbc351e8cad3197d2befefc (diff)
parent4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
-rw-r--r--indra/llui/lltabcontainer.cpp3
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;