diff options
author | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
commit | 1bfdfcb7b9dd392459b012b0712237716c94a84c (patch) | |
tree | bdc4dfb4ef49c209acbdc3e9dd633a5a8a29dbba /indra/llui/llbutton.cpp | |
parent | ab954444154de43ee18575a3b0649d0f3045dfd8 (diff) | |
parent | dab5ef9d881bc41bc4924102c939db25dd26e0d9 (diff) |
Merge pull from vir/drano
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rw-r--r-- | indra/llui/llbutton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index f0d92d597a..705fe16559 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -908,9 +908,9 @@ void LLButton::draw() // Not sure if it is really needed. Probably S32_MAX should be always passed as max_chars. mLastDrawCharsCount = mGLFont->render(label, 0, (F32)x, - (F32)(mBottomVPad + y_offset), + (F32)(getRect().getHeight() / 2 + mBottomVPad), label_color % alpha, - mHAlign, LLFontGL::BOTTOM, + mHAlign, LLFontGL::VCENTER, LLFontGL::NORMAL, mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NO_SHADOW, S32_MAX, text_width, |