summaryrefslogtreecommitdiff
path: root/indra/llui/lltabcontainer.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-09 16:33:58 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-09 16:33:58 +0000
commitd1efc0fd52c0e5dc59951f50435e121305fe9b69 (patch)
tree7ac48a54efc4029b44a6743b08d351ecfd947801 /indra/llui/lltabcontainer.h
parent4d9bcc2c8f303464c3664a0a7304a1bc2d658e2e (diff)
parentc9b27bec33d601330afe854d0322d22fce9da76a (diff)
merge from viewer2 trunk.
Diffstat (limited to 'indra/llui/lltabcontainer.h')
-rw-r--r--indra/llui/lltabcontainer.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
index 4b5d45fb73..50ec2679f6 100644
--- a/indra/llui/lltabcontainer.h
+++ b/indra/llui/lltabcontainer.h
@@ -93,6 +93,16 @@ public:
last_tab;
/**
+ * Tab label horizontal alignment
+ */
+ Optional<LLFontGL::HAlign> font_halign;
+
+ /**
+ * Tab label ellipses
+ */
+ Optional<bool> use_ellipses;
+
+ /**
* Use LLCustomButtonIconCtrl or LLButton in LLTabTuple
*/
Optional<bool> use_custom_icon_ctrl;
@@ -294,6 +304,7 @@ private:
bool mCustomIconCtrlUsed;
S32 mTabIconCtrlPad;
+ bool mUseTabEllipses;
};
#endif // LL_TABCONTAINER_H