diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-02 09:45:59 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-02 09:45:59 -0700 |
| commit | a87b27c41ddef15fa4027549c38b0129107ff9f6 (patch) | |
| tree | 980583c52a68f94742abe157a3947e1a0a1d343c /indra/llui/lltooltip.cpp | |
| parent | 1d6957ce09f92df6c0766162de1a84547f40e3bd (diff) | |
| parent | 4cb1e766fcfcaba702c2638f4c7daa9dd17bcbd8 (diff) | |
merging of latest code
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 f737d48abf..d4670efedf 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) |