diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
| commit | 59ab227c4020565f85e6fc2edf3e3fcc16abb574 (patch) | |
| tree | 94265895fdc0df4d3c38f74288cbd87bc2e01c20 /indra/llui/lltextbox.cpp | |
| parent | 029f179719907d674f89e39577c37e82e654b59d (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
DRTVWR-528 merge up to 6.4.19
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 0afd32f332..134afc005b 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -163,13 +163,13 @@ BOOL LLTextBox::setTextArg( const std::string& key, const LLStringExplicit& text } -void LLTextBox::reshapeToFitText() +void LLTextBox::reshapeToFitText(BOOL called_from_parent) { reflow(); S32 width = getTextPixelWidth(); S32 height = getTextPixelHeight(); - reshape( width + 2 * mHPad, height + 2 * mVPad, FALSE ); + reshape( width + 2 * mHPad, height + 2 * mVPad, called_from_parent ); } |