diff options
author | simon <none@none> | 2013-03-25 12:19:02 -0700 |
---|---|---|
committer | simon <none@none> | 2013-03-25 12:19:02 -0700 |
commit | a976f5c217ce97c70a7e151b9a490e6a6ebf1396 (patch) | |
tree | 8d86c9060ac05b34b1a9dfd25f03451e18dcc326 /indra/llui/lltooltip.cpp | |
parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
parent | 98a82c50d539451e1931826ca75fbc01d611806d (diff) |
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
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) |