summaryrefslogtreecommitdiff
path: root/indra/newview/llgrouplist.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-01 21:47:22 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-01 21:47:22 -0700
commitaa0a129b6798f8be554d1d9d41cbd217a0040daf (patch)
treea206cf638fa4a8f48dd869e0ccf12b7b6a428972 /indra/newview/llgrouplist.cpp
parent98695056c2fbfb91de805d9e2a01cde23668c4d3 (diff)
parent86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (diff)
Automated Merge
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
-rw-r--r--indra/newview/llgrouplist.cpp2
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;
}