diff options
author | James Cook <james@lindenlab.com> | 2009-11-28 21:02:55 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-28 21:02:55 -0800 |
commit | e8b436591ad198a5aa37d51077e2d5b0d5b62562 (patch) | |
tree | 196a32ac8cc9b67809201e0d762eee4b47a8cb9e /indra/llui/lltooltip.cpp | |
parent | 0e34bc413aa562acf97b77333fb9a1f0ec9b55f0 (diff) | |
parent | 9d52d15db8b61ff3172fadb1b82cd39f892251c5 (diff) |
merge
Diffstat (limited to 'indra/llui/lltooltip.cpp')
-rw-r--r-- | indra/llui/lltooltip.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp index 959313a5b6..cf135997b2 100644 --- a/indra/llui/lltooltip.cpp +++ b/indra/llui/lltooltip.cpp @@ -300,9 +300,8 @@ void LLToolTip::initFromParams(const LLToolTip::Params& p) mTextBox->setText(p.message()); } - LLRect text_contents_rect = mTextBox->getContentsRect(); - S32 text_width = llmin(p.max_width(), text_contents_rect.getWidth()); - S32 text_height = text_contents_rect.getHeight(); + S32 text_width = llmin(p.max_width(), mTextBox->getTextPixelWidth()); + S32 text_height = mTextBox->getTextPixelHeight(); mTextBox->reshape(text_width, text_height); // reshape tooltip panel to fit text box |