diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2012-10-04 02:01:41 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2012-10-04 02:01:41 +0300 |
| commit | 4a02580f497bfd280d19bc7e434eb7d8fbfdab61 (patch) | |
| tree | fe3f60df37aedc919f936099a1a5b51443b2c3da | |
| parent | 7f3f5cc408d7b36478c7dd707e32f921c1e1b720 (diff) | |
| parent | efd8910069a01d8440e45f350979054f88e794cb (diff) | |
merge changes
| -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 4c730286da..be6d359c9a 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -767,7 +767,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect& { // freeze new size as fraction F32 new_fractional_size = (updated_auto_resize_headroom == 0.f) ? MAX_FRACTIONAL_SIZE - : llclamp(total_visible_fraction * (F32)(new_dim - panelp->getRelevantMinDim()) / updated_auto_resize_headroom, MIN_FRACTIONAL_SIZE, MAX_FRACTIONAL_SIZE); + : llclamp(total_visible_fraction * (F32)(new_dim - panelp->getRelevantMinDim() - 1) / updated_auto_resize_headroom, MIN_FRACTIONAL_SIZE, MAX_FRACTIONAL_SIZE); fraction_given_up -= new_fractional_size - panelp->mFractionalSize; fraction_remaining -= panelp->mFractionalSize; panelp->mFractionalSize = new_fractional_size; |