diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-10 17:53:09 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-10 17:53:09 -0700 |
| commit | 7e13856df2c60a7e011df01459a3a085a3a4a82a (patch) | |
| tree | 7fc6703b611628359cfec9a7a3107e05946dc94b /indra/llui/llbutton.cpp | |
| parent | 6ad54f22f6ba0fe9f63823d57fd7c15d34e183aa (diff) | |
| parent | 6a570a9bdc2660e4db87e8e7a65b724e1ad8d1b2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 68cb5164b6..ba3748a573 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -1002,7 +1002,7 @@ void LLButton::resize(LLUIString label) if (mImageOverlay) { S32 overlay_width = mImageOverlay->getWidth(); - F32 scale_factor = getRect().getHeight() / (F32)mImageOverlay->getHeight(); + F32 scale_factor = (getRect().getHeight() - (mImageOverlayBottomPad + mImageOverlayTopPad)) / (F32)mImageOverlay->getHeight(); overlay_width = llround((F32)overlay_width * scale_factor); switch(mImageOverlayAlignment) |