Pull merge from richard/viewer-chui

indra/newview/llconversationview.cpp

@@ -109,6 +109,7 @@ void LLConversationViewSession::startFlashing()
 {
 	if (mFlashStateOn && !mFlashStarted)
 	{
+		llinfos << "Merov debug : Start the flashing for " << getName() << llendl;
 		mFlashStarted = true;
 		mFlashTimer->startFlashing();
 	}

indra/newview/llimview.cpp

@@ -155,6 +155,8 @@ void on_new_message(const LLSD& msg)
     }
 
     // execution of the action
+	llinfos << "Merov debug : on_new_message action = " << action << llendl;
+	
 
     LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
     LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::getConversation(session_id);
@@ -174,13 +176,11 @@ void on_new_message(const LLSD& msg)
     if ("toast" == action)
     {
         // Skip toasting if we have open window of IM with this session id
-        if (
-            session_floater
+        if (session_floater
             && session_floater->isInVisibleChain()
             && session_floater->hasFocus()
             && !session_floater->isMinimized()
-            && !(session_floater->getHost()
-            && session_floater->getHost()->isMinimized())
+            && !(session_floater->getHost() && session_floater->getHost()->isMinimized())
             )
         {
             return;
@@ -222,10 +222,10 @@ void on_new_message(const LLSD& msg)
                 gToolBarView->flashCommand(LLCommandId("chat"), true);
             }
             //conversation floater is open but a different conversation is focused
-            else
-            {
+            //else
+            //{
                 im_box->flashConversationItemWidget(session_id, true);
-            }
+            //}
     	}
     }
 

indra/newview/skins/default/colors.xml

@@ -11,9 +11,6 @@
 	<color
 	 name="EmphasisColor_35"
 	 value="0.38 0.694 0.573 0.35" />
-    <color
-    name="BeaconColor"
-    value="1 .67 .2 1" />	 
 	<color
 	 name="BeaconColor"
     value="1 .67 .2 1" />