diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 12:16:24 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 12:16:24 -0500 |
| commit | ace0be2a7c0665e382e47aeedfcffed7410e11a9 (patch) | |
| tree | 2d437342310d52806c6b378f1046ad56d9eb6456 /indra/llui/lltextbox.cpp | |
| parent | 90bb29245cbd9626f840f1d16c351ac415f7c35e (diff) | |
| parent | 1e5f2f5d8c4264cc704c687aa1b624296b6444e2 (diff) | |
merge with avp-tip
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llui/lltextbox.cpp')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 0bd0ab59fb..a1f5b5726b 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -134,12 +134,12 @@ void LLTextBox::setClickedCallback( boost::function<void (void*)> cb, void* user S32 LLTextBox::getTextPixelWidth() { - return getContentsRect().getWidth(); + return getTextBoundingRect().getWidth(); } S32 LLTextBox::getTextPixelHeight() { - return getContentsRect().getHeight(); + return getTextBoundingRect().getHeight(); } |