diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-04 20:28:01 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-04 20:28:01 -0800 |
| commit | fbc414c02b80da1c0c5c1ebbbbcb84958938be6e (patch) | |
| tree | 27a1ff7592fa9f9de9e0f3d228076c59174bdd41 /indra/llui/lllayoutstack.cpp | |
| parent | 12554bffb34895533ed11013a780bfa088756a67 (diff) | |
| parent | 39ff545bab2c1e05b7b9fe14ee99828795f1f78f (diff) | |
Merge with viewer-chui
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 0674275612..e642883991 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -32,7 +32,6 @@ #include "lllocalcliprect.h" #include "llpanel.h" -#include "llresizebar.h" #include "llcriticaldamp.h" #include "boost/foreach.hpp" @@ -796,6 +795,11 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect& } else { + if (new_auto_resize_headroom < 1.f) + { + new_auto_resize_headroom = 1.f; + } + F32 new_fractional_size = llclamp(total_visible_fraction * (F32)(panelp->mTargetDim - panelp->getRelevantMinDim() + delta_auto_resize_headroom) / new_auto_resize_headroom, MIN_FRACTIONAL_SIZE, |