diff options
| author | James Cook <james@lindenlab.com> | 2009-12-01 11:47:13 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-01 11:47:13 -0800 |
| commit | dd6fa93d84a267c6367f83c2d7581207e6dd878d (patch) | |
| tree | 1a40f8b6dc205addad73637f4d02caa060c88838 /indra/llui/lltooltip.cpp | |
| parent | 27351b8bf59c3b2cfc31c27947397055a40b52d7 (diff) | |
| parent | 8025c15a71fa1ee9fa34781f7cf74dde8c4e622b (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 d7228c78bd..01c7a81309 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 |