diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
commit | 890ec637d41330a2a91d23b09b6aaaf49738d19a (patch) | |
tree | b093f98112fb0cfdcad5452df1b266f1e0052fc0 /indra/newview/llgrouplist.cpp | |
parent | 1d1e4c7abe5c46cfafbc351e8cad3197d2befefc (diff) | |
parent | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
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 1ed1113f4d..bcfb516b81 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 LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking(); + return real_group_selected && LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking(); return real_group_selected; } |