diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:41:02 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-04-29 13:41:02 -0700 |
| commit | e41412eddaa5e8fcc808018aadc844dd68c6c247 (patch) | |
| tree | 9dea64df34a79e5d6454ab0f29c52e70243b388e /indra/llui/llview.cpp | |
| parent | 75f26d123da0d90c13f1614118c4ace8c1f04598 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-531
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index e3a6a98a9f..cd47e2ecea 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1402,7 +1402,9 @@ void LLView::reshape(S32 width, S32 height, BOOL called_from_parent) S32 delta_x = child_rect.mLeft - viewp->getRect().mLeft; S32 delta_y = child_rect.mBottom - viewp->getRect().mBottom; viewp->translate( delta_x, delta_y ); - if (child_rect.getWidth() != viewp->getRect().getWidth() || child_rect.getHeight() != viewp->getRect().getHeight()) + if (child_rect.getWidth() != viewp->getRect().getWidth() + || child_rect.getHeight() != viewp->getRect().getHeight() + || sForceReshape) { viewp->reshape(child_rect.getWidth(), child_rect.getHeight()); } |