summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-05-05 11:40:56 +0300
committerMike Antipov <mantipov@productengine.com>2010-05-05 11:40:56 +0300
commit4bff09dcf42cda492f3cd74a5614fe1aec9b538e (patch)
tree22d81f0c03175f95a9e6477f588235ad8267f719
parentccd4215fd4292ed34d68dd7be2c2cc2de92addcc (diff)
parent50433c36dc421e931cbbc487cc2875c09062612b (diff)
merge
--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)