diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 16:09:14 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 16:09:14 -0700 |
| commit | a11ec0c89f618cb9d039274e850356694a28dbb1 (patch) | |
| tree | 42f4e2637220af26a68dcf8acaa8dbf042082dbc /indra/newview/llgrouplist.cpp | |
| parent | 8daf25b65c30f58889ed5923d43bf785cb758026 (diff) | |
| parent | 7d8b37f72488ce30503d97d88e804160b11c6eff (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 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; } |