livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge 

--HG--
branch : product-engine
master
Vadim Savchuk 2009-12-21 15:27:40 +02:00
parent 88e091e930 c4d684d462
commit 10d20fdfe7
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llcallfloater.cpp
View File

@ -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);

2
indra/newview/llcallfloater.h
View File

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

4
indra/newview/llchiclet.cpp
View File

@ -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();