MAINT-7340 FIXED Incoming IMs steal focus if "Open conversation window" setting is enabled

2017-04-24 15:49:25 +03:00 · 2017-04-24 15:49:25 +03:00 · a48da20140
parent f9556f2e73
commit a48da20140
1 changed files with 5 additions and 2 deletions
--- 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)
 			{