summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.h
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-07-02 15:27:08 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-07-02 15:27:08 +0300
commit04838e411be0c7996fcddff5cccecb0df20db63f (patch)
tree7dcf7485bef071c0755f8d16f7f104fb0c2f8338 /indra/llui/lltextbase.h
parent0cf9168895b1d7b69e4a0307ade6cbc607f799f2 (diff)
parent3b9c7d3403b7b5aa7f1709cf5498bbe583f2e309 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/lltextbase.h')
-rw-r--r--indra/llui/lltextbase.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 920833de39..300ee0f05f 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -520,6 +520,7 @@ protected:
S32 mHPad; // padding on left of text
S32 mVPad; // padding above text
LLFontGL::HAlign mHAlign;
+ LLFontGL::VAlign mVAlign;
F32 mLineSpacingMult; // multiple of line height used as space for a single line of text (e.g. 1.5 to get 50% padding)
S32 mLineSpacingPixels; // padding between lines
const LLFontGL* mDefaultFont; // font that is used when none specified