diff options
| author | Richard Linden <none@none> | 2012-01-31 17:52:01 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-31 17:52:01 -0800 |
| commit | 178b30601b989aa98644c4e5c2ebcd9cd75490f7 (patch) | |
| tree | 97633629564adfca4b65a5ae6cc9ec2bc083f4fa | |
| parent | c47c31fdbfb1c02de13bc7f17af1e7d173c048f3 (diff) | |
fixed layout_stack regression resulting in side toolbars being truncated
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 88c2218f24..05261432e3 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -129,7 +129,9 @@ void LLLayoutPanel::setOrientation( LLLayoutStack::ELayoutOrientation orientatio ? getRect().getWidth() : getRect().getHeight())); - if (mAutoResize == FALSE && mMinDim == -1) + if (mAutoResize == FALSE + && mUserResize == TRUE + && mMinDim == -1 ) { setMinDim(layout_dim); } |