diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-07-22 13:29:05 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-07-22 13:29:05 -0700 |
| commit | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (patch) | |
| tree | 7a0787f0cb5a70890b878e999521ff4522fd75b4 /indra/newview/llparticipantlist.cpp | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
| parent | 9838884d908ad0c910251c64c7cb3c761ac11f70 (diff) | |
merged from "viewer-hotfix"
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index f2e6969998..8fe78a0f81 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -582,7 +582,7 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) else { std::string display_name = LLVoiceClient::getInstance()->getDisplayName(avatar_id); - mAvatarList->addAvalineItem(avatar_id, mSpeakerMgr->getSessionID(), display_name.empty() ? LLTrans::getString("AvatarNameWaiting") : display_name); + mAvatarList->addAvalineItem(avatar_id, mSpeakerMgr->getSessionID(), display_name.empty() ? display_name : LLTrans::getString("AvatarNameWaiting")); mAvalineUpdater->watchAvalineCaller(avatar_id); } adjustParticipant(avatar_id); |