summaryrefslogtreecommitdiff
path: root/indra/llui/lltabcontainer.cpp
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-19 14:32:55 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-19 14:32:55 -0500
commit9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch)
treebd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/llui/lltabcontainer.cpp
parentcd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff)
parent65f8b95ae8e93c3b946e43eea89bcb631723ca6c (diff)
Automated merge with file:///Users/chuck/Documents/hg/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;