diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-07 10:27:10 -0700 |
| commit | de62c3378171a69ff9a39f2f626f1b1d33d0763f (patch) | |
| tree | 053883ba8ae6d02460736ed8a786f1913761b00d /indra/newview/llparticipantlist.cpp | |
| parent | 25df7aca29074b6ae7f108c91673be117522bfc9 (diff) | |
| parent | 3ecec85feb4e9878b32f5737ab8e35747360f138 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llparticipantlist.cpp')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 79a6d80716..eb245453db 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -346,6 +346,7 @@ 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); @@ -631,7 +632,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& else if (item == "can_call") { bool not_agent = mUUIDs.front() != gAgentID; - bool can_call = not_agent && LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); + bool can_call = not_agent && LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking(); return can_call; } |