diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-13 17:30:42 -0700 |
commit | 99c115696fadfd4197d93b9b1b6cfb2d0ffb14c5 (patch) | |
tree | 857e9b14bcdd8822a6fdd3c964602cc5adb2152c /indra/newview/llgrouplist.cpp | |
parent | 2af4875309450fa3d3e266426ada12330489a8c9 (diff) | |
parent | 669953f6950000821c33e77d4c29ef0c905667f9 (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 252c34cf9c..5efd99b939 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -273,7 +273,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; } |