diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-15 19:20:03 -0500 |
| commit | 073ec70829723e54f822052fe9c6c3e998e8dfca (patch) | |
| tree | 3d7e782101a2284bcb0fcbf61273f8167d03544f /indra/llui/lltextbox.cpp | |
| parent | 4d4406820b858d59be670f0ca03bdadefba61c53 (diff) | |
| parent | e7eae453908e77a959a2ef6fea272107491fe35e (diff) | |
automated merge viewer2.0->avp
--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(); } |