From 178b30601b989aa98644c4e5c2ebcd9cd75490f7 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 31 Jan 2012 17:52:01 -0800
Subject: [PATCH] fixed layout_stack regression resulting in side toolbars
being truncated
---
indra/llui/lllayoutstack.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 88c2218f249..05261432e3c 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);
}
--
GitLab