diff options
author | Eli Linden <eli@lindenlab.com> | 2010-03-19 14:58:21 -0700 |
---|---|---|
committer | Eli Linden <eli@lindenlab.com> | 2010-03-19 14:58:21 -0700 |
commit | 66a8e4c208a7caa8641a667a340a63addab4ff6a (patch) | |
tree | 7aa6ceb3bf5b74ae83b7fe3d627d9e0f60cd4257 /indra/llui | |
parent | 3e678c1a8eab258f8ebe9ad8f8c0684589a669a8 (diff) | |
parent | 25a8ccd36427cb2e30dd140ac1fa1fa6639b5de4 (diff) |
Merge
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; } |