diff options
| author | Richard Linden <none@none> | 2012-02-02 11:36:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-02 11:36:27 -0800 |
| commit | ff10555bd8b64c5353b17b0389e8ec91241d5343 (patch) | |
| tree | 15d75ca75913444b5e4f925cd7c028386a27f8c0 | |
| parent | 9721e4f78362da8fce1c66762290ff72df06441c (diff) | |
| parent | 8f1f84212bb0b9ae85ef680ff20acfa4bcacd5cd (diff) | |
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.trckmy\ssh__richard@hg.lindenlab.com_richard_viewer-experience_ywvwfc.hg
| -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 05261432e3..31e0434753 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -325,7 +325,7 @@ void LLLayoutStack::updateLayout() panelp->mTargetDim = panelp->getRelevantMinDim(); } space_to_distribute -= panelp->getVisibleDim() + llround((F32)mPanelSpacing * panelp->getVisibleAmount()); - total_visible_fraction += panelp->mFractionalSize * panelp->getVisibleAmount(); + total_visible_fraction += panelp->mFractionalSize * panelp->getAutoResizeFactor(); } llassert(total_visible_fraction < 1.05f); |