diff options
author | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2023-07-18 10:51:51 -0700 |
commit | c5d7f3c4c1cf37ca0e68bbe9830bd3f3931476e5 (patch) | |
tree | c2af269fd56c04bb9ddca3d99a0cd68ab9d6c94e /indra/llui/lltextbox.cpp | |
parent | 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 (diff) | |
parent | ec4135da63a3f3877222fba4ecb59b15650371fe (diff) |
DRTVWR-489: trivial merge conflict fix
Diffstat (limited to 'indra/llui/lltextbox.cpp')
-rw-r--r-- | indra/llui/lltextbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index c567451973..521dabf9d4 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -171,7 +171,8 @@ void LLTextBox::reshapeToFitText(BOOL called_from_parent) S32 width = getTextPixelWidth(); S32 height = getTextPixelHeight(); - reshape( width + 2 * mHPad, height + 2 * mVPad, called_from_parent ); + //consider investigating reflow() to find missing width pixel (see SL-17045 changes) + reshape( width + 2 * mHPad + 1, height + 2 * mVPad, called_from_parent ); } |