From 9429d5d2f23c28c47b3f87774e811213cb9e2997 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 26 Jan 2012 19:35:42 +0200 Subject: EXP-1839 WIP Added some debugging messages. --- indra/newview/llparticipantlist.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llparticipantlist.cpp') diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 5c95e805ce..c1b931d7e8 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -760,6 +760,7 @@ void LLParticipantList::LLParticipantListMenu::toggleMute(const LLSD& userdata, LLPointer speakerp = mParent.mSpeakerMgr->findSpeaker(speaker_id); if (speakerp.isNull()) { + LL_WARNS("Speakers") << "Speaker " << speaker_id << " not found" << llendl; return; } LLAvatarListItem* item = dynamic_cast(mParent.mAvatarList->getItemByValue(speaker_id)); -- cgit v1.2.3 From 886946d699880e90b8d34d8b8c2e88d59929d4df Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 26 Jan 2012 19:37:53 +0200 Subject: EXP-1839 FIXED Fixed treating normal nearby speakers as text-only chat participants which led to marking muted avatars as non-muted. --- indra/newview/llparticipantlist.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llparticipantlist.cpp') diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index c1b931d7e8..183bc7b610 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -390,7 +390,10 @@ void LLParticipantList::onAvatarListRefreshed(LLUICtrl* ctrl, const LLSD& param) { const LLPointer& speakerp = *it; - update_speaker_indicator(list, speakerp->mID, speakerp->mModeratorMutedVoice); + if (speakerp->mStatus == LLSpeaker::STATUS_TEXT_ONLY) + { + update_speaker_indicator(list, speakerp->mID, speakerp->mModeratorMutedVoice); + } } } } -- cgit v1.2.3 From 13d510d5f2fa2d9bf654e70d9191f1909b1f299e Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 27 Jan 2012 19:31:52 +0200 Subject: 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. --- indra/newview/llparticipantlist.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llparticipantlist.cpp') diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 183bc7b610..975a6c67d8 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -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(); } -- cgit v1.2.3