summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-08-14 01:06:48 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-08-14 01:06:48 +0300
commite67e9f63c30555467ac6a381e229e45150fb2509 (patch)
tree259d9e84ddac3cb5f8ebbf4b370d1c4a3930c8f7 /indra/llui/lltextbase.cpp
parenta62a0fc62ce961dd570eefbe37eda51e50310df6 (diff)
SL-13293 Fixed reshape behavior for scale change
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 83b851eed2..fc1301351d 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1148,7 +1148,7 @@ BOOL LLTextBase::handleToolTip(S32 x, S32 y, MASK mask)
void LLTextBase::reshape(S32 width, S32 height, BOOL called_from_parent)
{
- if (width != getRect().getWidth() || height != getRect().getHeight())
+ if (width != getRect().getWidth() || height != getRect().getHeight() || LLView::sForceReshape)
{
bool scrolled_to_bottom = mScroller ? mScroller->isAtBottom() : false;