diff options
| author | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
| commit | cb82e865a02a32f2d4e207974ff9373a99ceec95 (patch) | |
| tree | ce19fff3e038e7097b09440f955d1018c97f571a /indra/llui | |
| parent | b47a7751990b240198d4e868f5a35bbd1b34e4ee (diff) | |
| parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) | |
merging latest changes?
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmultifloater.cpp | 10 |
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) { } |