diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-08 21:39:38 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-08 21:39:38 -0800 |
| commit | 20379fecd9aea4d3450bcda815ad63f0ce9c729f (patch) | |
| tree | 21ef1bddf49efc133b9ec74e572345125fb62175 /indra/newview/llparticipantlist.cpp | |
| parent | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (diff) | |
| parent | 8bd5a3bca38b0ba663d3563029e54da057020424 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 2748daaffa..89672b7a0f 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -346,7 +346,6 @@ void LLParticipantList::addAvatarIDExceptAgent(const LLUUID& avatar_id) { if (mExcludeAgent && gAgent.getID() == avatar_id) return; if (mAvatarList->contains(avatar_id)) return; - mAvatarList->getIDs().push_back(avatar_id); mAvatarList->setDirty(); adjustParticipant(avatar_id); @@ -632,7 +631,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& else if (item == "can_call") { bool not_agent = mUUIDs.front() != gAgentID; - bool can_call = not_agent && LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking(); + bool can_call = not_agent && LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); return can_call; } |