diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-14 18:36:11 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-04-14 18:36:11 +0300 |
| commit | 7a65a9430e1904f9c9b23d6f75a567e76a962312 (patch) | |
| tree | b9b0c4c6f9638aadead6f19210614f7585f195d1 /indra | |
| parent | dd73ac682eba2f0f33c636d636298a3e6982f16a (diff) | |
Fixed low priority bug EXT-6781 (Text edit field should be in focus after IM button has been pressed).
Explicitly focus the input editor whenever an IM tab gets visible.
Added a check for the IM tab to have focus and only then pass the focus to the input entry.
The check is needed for the fix not to re-introduce EXT-5387 (Private IM Window Steals Focus from Nearby Chat).
Reviewed by Alex: https://codereview.productengine.com/secondlife/r/224/
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 3ec8d11fb0..19dbc564d1 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -499,8 +499,8 @@ void LLIMFloater::setVisible(BOOL visible) { //only if floater was construced and initialized from xml updateMessages(); - //prevent steal focus when IM opened in multitab mode - if (!isChatMultiTab()) + //prevent stealing focus when opening a background IM tab (EXT-5387, checking focus for EXT-6781) + if (!isChatMultiTab() || hasFocus()) { mInputEditor->setFocus(TRUE); } |