fixed layout_stack regression resulting in side toolbars being truncated

2012-01-31 17:52:01 -08:00 · 2012-01-31 17:52:01 -08:00 · 178b30601b
parent c47c31fdbf
commit 178b30601b
1 changed files with 3 additions and 1 deletions
--- 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);
 	}