diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-08 10:10:59 -0500 |
| commit | a7f02a3e51f07c657a0acd31637f46f74b30daf7 (patch) | |
| tree | c572c162ee7bec027971ca7a64f74032938b20a8 /indra/llui/lltooltip.cpp | |
| parent | cce59647a99648af63c96168c36e85563da40a1a (diff) | |
| parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) | |
merge changes for 3.5.0-beta2
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) |