diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-14 01:06:48 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-14 01:06:48 +0300 |
| commit | e67e9f63c30555467ac6a381e229e45150fb2509 (patch) | |
| tree | 259d9e84ddac3cb5f8ebbf4b370d1c4a3930c8f7 /indra/llui/lltextbox.cpp | |
| parent | a62a0fc62ce961dd570eefbe37eda51e50310df6 (diff) | |
SL-13293 Fixed reshape behavior for scale change
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 ); } |