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/lllayoutstack.cpp | |
| parent | 029f179719907d674f89e39577c37e82e654b59d (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
DRTVWR-528 merge up to 6.4.19
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 4aae1e374b..29a156e933 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -166,7 +166,7 @@ void LLLayoutPanel::setVisible( BOOL visible ) void LLLayoutPanel::reshape( S32 width, S32 height, BOOL called_from_parent /*= TRUE*/ ) { - if (width == getRect().getWidth() && height == getRect().getHeight()) return; + if (width == getRect().getWidth() && height == getRect().getHeight() && !LLView::sForceReshape) return; if (!mIgnoreReshape && mAutoResize == false) { |