summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-11 18:40:54 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-11 18:40:54 -0800
commitef71206e3074da803d8b9439f56409904f1f3eb0 (patch)
tree64451afd3838ef46df9c4c1888128f3086c7499b /indra
parent9f8959d480d1069f554c576a4cc9a494559ef1e4 (diff)
parent88639dd862be6558f0777e99c571dcd807efa4ba (diff)
pull from richard/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)
{
}