summaryrefslogtreecommitdiff
path: root/indra/llui/lltabcontainer.cpp
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-02-18 15:48:56 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-02-18 15:48:56 -0800
commite0efa1dfa236f8a52a88212298b6e5113ef8f07a (patch)
tree9a94d26d308981d2070129147b9ba751118bdd76 /indra/llui/lltabcontainer.cpp
parentef9b7c5b36c7521c4519e682aa312c4c25c31c2f (diff)
parent890ec637d41330a2a91d23b09b6aaaf49738d19a (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;