merge

--HG--
branch : product-engine

indra/newview/llcallfloater.cpp

@@ -162,6 +162,7 @@ void LLCallFloater::onChange()
 	if (NULL == mPaticipants) return;
 
 	mPaticipants->refreshVoiceState();
+
 }
 
 
@@ -243,7 +244,7 @@ void LLCallFloater::updateSession()
 	childSetVisible("leave_call_btn", !is_local_chat);
 	
 	refreshPartisipantList();
-	updateModeratorState();
+	updateAgentModeratorState();
 
 	//show floater for voice calls
 	if (!is_local_chat)
@@ -366,7 +367,7 @@ void LLCallFloater::setModeratorMutedVoice(bool moderator_muted)
 	mSpeakingIndicator->setIsMuted(moderator_muted);
 }
 
-void LLCallFloater::updateModeratorState()
+void LLCallFloater::updateAgentModeratorState()
 {
 	std::string name;
 	gCacheName->getFullName(gAgentID, name);

indra/newview/llcallfloater.h

@@ -101,7 +101,7 @@ class LLCallFloater : public LLDockableFloater, LLVoiceClientParticipantObserver
 	void updateTitle();
 	void initAgentData();
 	void setModeratorMutedVoice(bool moderator_muted);
-	void updateModeratorState();
+	void updateAgentModeratorState();
 
 private:
 	LLSpeakerMgr* mSpeakerManager;

indra/newview/llchiclet.cpp

@@ -187,9 +187,9 @@ void LLSysWellChiclet::setCounter(S32 counter)
 
 	mButton->setLabel(s_count);
 
-	setNewMessagesState(counter > 0);
+	setNewMessagesState(counter > mCounter);
 
-	// we have to flash to 'Lit' state each time new unread message is comming.
+	// we have to flash to 'Lit' state each time new unread message is coming.
 	if (counter > mCounter)
 	{
 		mFlashToLitTimer->flash();