diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-04-24 15:49:25 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-04-24 15:49:25 +0300 |
| commit | a48da201406f435d917b564a08b53eef6e4e321e (patch) | |
| tree | 997ab977738294f2d6eea5e312d26898479c8657 /indra/newview | |
| parent | f9556f2e7348711c75a9fe13419122893967d834 (diff) | |
MAINT-7340 FIXED Incoming IMs steal focus if "Open conversation window" setting is enabled
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index bcda9baa9a..feef726630 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -269,8 +269,11 @@ void notify_of_message(const LLSD& msg, bool is_dnd_msg) { if(!gAgent.isDoNotDisturb()) { - // Open conversations floater - LLFloaterReg::showInstance("im_container"); + if(!LLAppViewer::instance()->quitRequested() && !LLFloater::isVisible(im_box)) + { + // Open conversations floater + LLFloaterReg::showInstance("im_container"); + } im_box->collapseMessagesPane(false); if (session_floater) { |