summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-11 09:10:33 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-11 09:10:33 -0700
commit05b31ff3b235bdcf7e9bb0fe1ff701c006e8ec66 (patch)
tree4fd5e083694142609bd099cf71e092f9c7457e9f /indra/llui/llbutton.cpp
parent0620e6a79149e455744131703e8bdb74864b69be (diff)
parentc845925eebb5cad3049ee0f3b1d0adea3e3a46b5 (diff)
Merge
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rw-r--r--indra/llui/llbutton.cpp2
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)