diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-04-30 13:25:48 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-04-30 13:25:48 +0300 |
| commit | 78eed3fc075049fa100ffe23ab508120977aaaed (patch) | |
| tree | d782f0a3c61e2fdcce36e3468b38e1238c9a0830 /indra/newview/llparticipantlist.cpp | |
| parent | 85e3432579844afa8f76b4071329264f85711507 (diff) | |
WIP: normal bug EXT-6865 (Voice isn't blocked for Avaline callers connected via PSTN bridge)
Applyied Aimee's patch to enable blocking of avaline caller:
added an "External" mute type which isn't sent to the SL servers or stored in the cache across sessions.
The caller's ID will change each time so there's no point cluttering up the mute list by persisting them.
Known issue: Right now the mute is added with the caller's phone number as the name shown in the block list,
so that will need changing to "Avaline Caller 1" etc
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index c3748ca81d..a058548459 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -722,7 +722,21 @@ void LLParticipantList::LLParticipantListMenu::toggleMute(const LLSD& userdata, name = speakerp->mDisplayName; - LLMute mute(speaker_id, name, speakerp->mType == LLSpeaker::SPEAKER_AGENT ? LLMute::AGENT : LLMute::OBJECT); + LLMute::EType mute_type; + switch (speakerp->mType) + { + case LLSpeaker::SPEAKER_AGENT: + mute_type = LLMute::AGENT; + break; + case LLSpeaker::SPEAKER_OBJECT: + mute_type = LLMute::OBJECT; + break; + case LLSpeaker::SPEAKER_EXTERNAL: + default: + mute_type = LLMute::EXTERNAL; + break; + } + LLMute mute(speaker_id, name, mute_type); if (!is_muted) { |