summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-05 10:24:32 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-05 10:24:32 +0100
commite2e329b2e22dbab52d12ff309fb78533cb52c8e9 (patch)
tree2f184f375caf2458d9db9c9cf28dd15ca4625b26 /indra
parentf48d7f0d7b5c226837c0e0cc6d99c22d4b43810b (diff)
parent4bff09dcf42cda492f3cd74a5614fe1aec9b538e (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra')
-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)