diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-03-19 17:54:23 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-03-19 17:54:23 -0400 |
| commit | 4b6b0fda9dae6bb35353b4a6280ce0e36af7798b (patch) | |
| tree | 43e8b2b9b8785f02fa60bc2e022c527880fc7f5a /indra/llui | |
| parent | 241988c4086e85fc34cd4344b6483d4224385be7 (diff) | |
| parent | 25a8ccd36427cb2e30dd140ac1fa1fa6639b5de4 (diff) | |
Merge llqtwebkit package fix take 3 with viewer-2-0 tip.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llmultifloater.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp index 33d47a3f0e..4af9108329 100644 --- a/indra/llui/llmultifloater.cpp +++ b/indra/llui/llmultifloater.cpp @@ -352,6 +352,13 @@ BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask) if (floater && floater->canClose() && floater->isCloseable()) { floater->closeFloater(); + + // EXT-5695 (Tabbed IM window loses focus if close any tabs by Ctrl+W) + // bring back focus on tab container if there are any tab left + if(mTabContainer->getTabCount() > 0) + { + mTabContainer->setFocus(TRUE); + } } return TRUE; } |