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

EXP-1847 FIXED Fixed inability to mute a nearby avatar in Voice Settings if the speakers list is sorted by name. 

Added missing update of the floater's internal speaker list.
master
Vadim ProductEngine 2012-01-27 19:31:52 +02:00
parent 886946d699
commit 13d510d5f2
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llcallfloater.cpp
View File

@ -188,7 +188,7 @@ void LLCallFloater::draw()
// Need to resort the participant list if it's in sort by recent speaker order.
if (mParticipants)
mParticipants->updateRecentSpeakersOrder();
mParticipants->update();
LLFloater::draw();
}

2
indra/newview/llpanelimcontrolpanel.cpp
View File

@ -374,7 +374,7 @@ void LLPanelGroupControlPanel::draw()
{
// Need to resort the participant list if it's in sort by recent speaker order.
if (mParticipantList)
mParticipantList->updateRecentSpeakersOrder();
mParticipantList->update();
LLPanelChatControlPanel::draw();
}

6
indra/newview/llparticipantlist.cpp
View File

@ -469,12 +469,12 @@ void LLParticipantList::setValidateSpeakerCallback(validate_speaker_callback_t c
mValidateSpeakerCallback = cb;
}
void LLParticipantList::updateRecentSpeakersOrder()
void LLParticipantList::update()
{
mSpeakerMgr->update(true);
if (E_SORT_BY_RECENT_SPEAKERS == getSortOrder() && !isHovered())
{
// Need to update speakers to sort list correctly
mSpeakerMgr->update(true);
// Resort avatar list
sort();
}

4
indra/newview/llparticipantlist.h
View File

@ -72,9 +72,9 @@ public:
const EParticipantSortOrder getSortOrder() const;
/**
* Refreshes the participant list if it's in sort by recent speaker order.
* Refreshes the participant list.
*/
void updateRecentSpeakersOrder();
void update();
/**
* Set a callback to be called before adding a speaker. Invalid speakers will not be added.