summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-05-05 11:39:52 +0300
committerMike Antipov <mantipov@productengine.com>2010-05-05 11:39:52 +0300
commit50433c36dc421e931cbbc487cc2875c09062612b (patch)
tree20b5501188330f041a4cc64eb5136dd79401a634
parent5078f522b14d87c6c4adf97f93004b8610bb8e9b (diff)
Fixed normal bug EXT-6865 (Voice isn't blocked for Avaline callers connected via PSTN bridge)
Current patch fixes displaing of Avaline callers in Block List: * Now it shows as Avaline Caller 1, etc. Implemented via using name from AvatarListItem to create LLMute object. Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/340/ --HG-- branch : product-engine
-rw-r--r--indra/newview/llparticipantlist.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp
index a058548459..8c908449a0 100644
--- a/indra/newview/llparticipantlist.cpp
+++ b/indra/newview/llparticipantlist.cpp
@@ -719,8 +719,10 @@ void LLParticipantList::LLParticipantListMenu::toggleMute(const LLSD& userdata,
{
return;
}
+ LLAvatarListItem* item = dynamic_cast<LLAvatarListItem*>(mParent.mAvatarList->getItemByValue(speaker_id));
+ if (NULL == item) return;
- name = speakerp->mDisplayName;
+ name = item->getAvatarName();
LLMute::EType mute_type;
switch (speakerp->mType)