diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-02 12:32:56 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-02 12:32:56 -0400 |
| commit | 873de2daae04a63c796661ff6d4db6aa912041bf (patch) | |
| tree | 1e44c8c87fc8c86013a8843c572ec6fac4409eab /indra/newview/llgrouplist.cpp | |
| parent | 580ecaefcac2eb928c3dbdc9240e3fb54f3c989f (diff) | |
| parent | a7085418df1ada6e19b94b6df772ed21e663d119 (diff) | |
automated 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 8a056f836f..03a47b5983 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::voiceEnabled()&&gVoiceClient->voiceWorking(); + return real_group_selected && LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking(); return real_group_selected; } |