summaryrefslogtreecommitdiff
path: root/indra/llui/lltabcontainer.cpp
diff options
context:
space:
mode:
authorPalmer Truelson <palmer@lindenlab.com>2010-02-22 14:20:50 -0800
committerPalmer Truelson <palmer@lindenlab.com>2010-02-22 14:20:50 -0800
commitdcbbf64c41aac85613591b51071b9453bdb1df0f (patch)
tree4c6d654770aa53a2e1f1ca4b24ed9fa8d0a247dc /indra/llui/lltabcontainer.cpp
parentca12b3d971db20559cb242417dc6c3f64d63c1d6 (diff)
parent722c5fb92ebcf61190edc7ec29c8f5ea1f826cf9 (diff)
merge
Diffstat (limited to 'indra/llui/lltabcontainer.cpp')
-rw-r--r--indra/llui/lltabcontainer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index c9bdacd4b7..b0c0af9f9a 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -215,7 +215,7 @@ LLTabContainer::Params::Params()
use_custom_icon_ctrl("use_custom_icon_ctrl", false),
tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0),
use_ellipses("use_ellipses"),
- font_halign("font_halign")
+ font_halign("halign")
{
name(std::string("tab_container"));
mouse_opaque = false;