diff options
| author | Richard Linden <none@none> | 2013-11-12 11:42:06 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-12 11:42:06 -0800 |
| commit | 6ddfc8031c73f342cf8459445a20cd50ceb3efba (patch) | |
| tree | 4a209fa66ac39930c089a1477a1f4eb2542ad5bb /indra/llui/llmultifloater.cpp | |
| parent | b6688529877e9f3a46d251c64c002fbe8fd8cbb6 (diff) | |
BUILDFIX - miscellaneous stuff missed in the merge
Diffstat (limited to 'indra/llui/llmultifloater.cpp')
| -rwxr-xr-x | indra/llui/llmultifloater.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp index 48b5b08c1b..d1a597511e 100755 --- a/indra/llui/llmultifloater.cpp +++ b/indra/llui/llmultifloater.cpp @@ -67,14 +67,13 @@ void LLMultiFloater::buildTabContainer() } } -void LLMultiFloater::onOpen(const LLSD& key) +void LLMultiFloater::onClose(bool app_quitting) { -// if (mTabContainer->getTabCount() <= 0) -// { -// // for now, don't allow multifloaters -// // without any child floaters -// closeFloater(); -// } + if(isMinimized()) + { + setMinimized(FALSE); + } + LLFloater::onClose(app_quitting); } void LLMultiFloater::draw() |