Pull and merge ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.

1 files changed, 16 insertions, 4 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index b6fd3ec9c8..821e62c4e6 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -192,12 +192,24 @@ void on_new_message(const LLSD& msg)
     else if("openconversations" == action)
     {
         LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
-        if (im_box)
+        LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(session_id);
+
+        //Don't flash and show conversation floater when conversation already active (has focus)
+        if(session_floater
+            && (!session_floater->isInVisibleChain()) //conversation floater not displayed
+                || 
+                (session_floater->isInVisibleChain() && session_floater->hasFocus() == false)) //conversation floater is displayed but doesn't have focus
+
         {
-            im_box->flashConversationItemWidget(session_id, true); // flashing of the conversation's item
+            //Flash line item
+            if (im_box)
+            {
+                im_box->flashConversationItemWidget(session_id, true); // flashing of the conversation's item
+            }
+
+            //Surface conversations floater
+            LLFloaterReg::showInstance("im_container");
         }
-
-        LLFloaterReg::showInstance("im_container");
     }
 }