diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-16 11:43:08 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-16 11:43:08 -0500 |
| commit | 9813df87af1d895a3183eb33648009fd70ce6ed7 (patch) | |
| tree | 4cb519a2402856c7ede8d5ba5e8feff798ea6bdb /indra/llui/lltextbox.cpp | |
| parent | adec0ba983c6b01c3d6c08692f3d5c7979ba90bb (diff) | |
| parent | 073ec70829723e54f822052fe9c6c3e998e8dfca (diff) | |
merge
--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(); } |