diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-05-08 09:30:39 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 09:30:39 -0700 |
| commit | 470d1595cc1c1c7c7ec3ab192e68622751423354 (patch) | |
| tree | 079cd01cc1b247973f2e5fd589389cc8e0013b13 /indra/llui/lllayoutstack.cpp | |
| parent | 06097302f4ad8786913e77514d5d60678da3160d (diff) | |
| parent | 34322f8f37380df868703051230f2a4109602b3f (diff) | |
Merge viewer-release
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index ce8dbb1f66..955e7089f4 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -251,8 +251,14 @@ void LLLayoutStack::draw() // always clip to stack itself LLLocalClipRect clip(getLocalRect()); - BOOST_FOREACH(LLLayoutPanel* panelp, mPanels) + for (LLLayoutPanel* panelp : mPanels) { + if ((!panelp->getVisible() || panelp->mCollapsed) + && (panelp->mVisibleAmt < 0.001f || !mAnimate)) + { + // essentially invisible + continue; + } // clip to layout rectangle, not bounding rectangle LLRect clip_rect = panelp->getRect(); // scale clipping rectangle by visible amount |