diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 10:12:54 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 10:12:54 -0800 |
| commit | 6ff6ed4d1148a66b188472c94b58bd573389942d (patch) | |
| tree | a4a6e2a4711c3d9a3dd019e98507a568cac4ba60 /indra/newview/llgrouplist.cpp | |
| parent | f11f8b34478f0d408689fe7959f233567001374d (diff) | |
| parent | 254b7d72d17c279aa906ee235f08ff1fa9e2b9cf (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llgrouplist.cpp')
| -rw-r--r-- | indra/newview/llgrouplist.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index e75d35bea4..e01709aa3a 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -48,6 +48,7 @@ #include "lltextutil.h" #include "llviewercontrol.h" // for gSavedSettings #include "llviewermenu.h" // for gMenuHolder +#include "llvoiceclient.h" static LLDefaultChildRegistry::Register<LLGroupList> r("group_list"); S32 LLGroupListItem::sIconWidth = 0; @@ -271,6 +272,9 @@ bool LLGroupList::onContextMenuItemEnable(const LLSD& userdata) if (userdata.asString() == "activate") return gAgent.getGroupID() != selected_group_id; + if (userdata.asString() == "call") + return LLVoiceClient::voiceEnabled()&&gVoiceClient->voiceWorking(); + return real_group_selected; } |