diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-07 17:09:46 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-07 17:09:46 -0700 |
| commit | 89fad5ded4b5e78bf83f5c9817cb5220703883bc (patch) | |
| tree | 3575e72890c82cf28ddcfbe18ca778f9dfef8fc6 /indra/newview/llgrouplist.cpp | |
| parent | 6900278d7f787f8a3fe5d06e2eceb91c9dd9d5bd (diff) | |
| parent | 2288edf80ff87ca55b49b22b0f794083f78f86d9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
| -rw-r--r-- | indra/newview/llgrouplist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index 03a47b5983..8a056f836f 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -287,7 +287,7 @@ bool LLGroupList::onContextMenuItemEnable(const LLSD& userdata) return gAgent.getGroupID() != selected_group_id; if (userdata.asString() == "call") - return real_group_selected && LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); + return real_group_selected && LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking(); return real_group_selected; } |