diff options
| author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 10:05:42 -0800 |
|---|---|---|
| committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 10:05:42 -0800 |
| commit | 82425a230c5ac7c0ca8a9ae55a1addadca9d99e9 (patch) | |
| tree | 8705515b0bd2e699980fe832f2fe6739fb5ad895 /indra/llui/lltextbox.cpp | |
| parent | 941497dd30c409a2f352b0bfc1c48bfaca5ea76e (diff) | |
| parent | 60e6fa139e8056288514cfa7276eee9133953de9 (diff) | |
Merge
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(); } |