summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-11 17:51:47 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-11 17:51:47 -0800
commit5de5a172144b2b95180e17ea8d8292f383ef6d7b (patch)
tree2cd6bc24d9f618761f61f9312e953982a5bd05c9 /indra
parent573ab07a40acc78e28ae390331d862d3f858bb07 (diff)
parent88639dd862be6558f0777e99c571dcd807efa4ba (diff)
Pull from viewer-chui
Diffstat (limited to 'indra')
-rw-r--r--indra/llui/llmultifloater.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
index 59faabd482..179b251cdb 100644
--- a/indra/llui/llmultifloater.cpp
+++ b/indra/llui/llmultifloater.cpp
@@ -37,10 +37,12 @@
//
LLMultiFloater::LLMultiFloater(const LLSD& key, const LLFloater::Params& params)
- : LLFloater(key)
- , mTabContainer(NULL)
- , mTabPos(LLTabContainer::TOP)
- , mAutoResize(TRUE)
+ : LLFloater(key),
+ mTabContainer(NULL),
+ mTabPos(LLTabContainer::TOP),
+ mAutoResize(TRUE),
+ mOrigMinWidth(params.min_width),
+ mOrigMinHeight(params.min_height)
{
}