diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
commit | e23228fef2834587af490d0345f29212445666d8 (patch) | |
tree | dfa761027aca1227ec1817707f8141b833c061df /indra/llui/lltooltip.cpp | |
parent | c880c961bb2a0838bc529efc07cfeb12f5636d88 (diff) | |
parent | 8a330ee2eb1008951f5e5159057fa5736dd805b4 (diff) |
merge 3.5.0-release
Diffstat (limited to 'indra/llui/lltooltip.cpp')
-rw-r--r-- | indra/llui/lltooltip.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index 7f1566d64a..f52a3b3323 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -288,7 +288,7 @@ void LLToolTip::initFromParams(const LLToolTip::Params& p) mTextBox->setText(p.message()); } - S32 text_width = llmin(p.max_width(), mTextBox->getTextPixelWidth()); + S32 text_width = llmin(p.max_width(), mTextBox->getTextPixelWidth() + 1); S32 text_height = mTextBox->getTextPixelHeight(); mTextBox->reshape(text_width, text_height); if (mInfoButton) |