diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-02 12:40:38 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-02 12:40:38 -0400 |
| commit | 695671d51e1bb7c1039fffa057d0477210aca308 (patch) | |
| tree | dcabd143ec6c27178b6616d9efaa98d108146056 /indra/llui/lltextbase.h | |
| parent | 655c3dbe1b711389c1f581f4ccae07dafb5cdefd (diff) | |
| parent | 1417bd3985f339915f259bf5971ef21e47e30163 (diff) | |
automated merge
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index fe8ebb1b80..ff63cc26f5 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -357,6 +357,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 |