diff options
| author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 10:05:42 -0800 |
|---|---|---|
| committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-15 10:05:42 -0800 |
| commit | 82425a230c5ac7c0ca8a9ae55a1addadca9d99e9 (patch) | |
| tree | 8705515b0bd2e699980fe832f2fe6739fb5ad895 /indra/newview/llpanelpeople.cpp | |
| parent | 941497dd30c409a2f352b0bfc1c48bfaca5ea76e (diff) | |
| parent | 60e6fa139e8056288514cfa7276eee9133953de9 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
| -rw-r--r-- | indra/newview/llpanelpeople.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 1e4682701e..5fb7dab7be 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -775,7 +775,7 @@ void LLPanelPeople::updateButtons() buttonSetEnabled("teleport_btn", friends_tab_active && item_selected && isFriendOnline(selected_uuids.front())); buttonSetEnabled("view_profile_btn", item_selected); buttonSetEnabled("im_btn", multiple_selected); // allow starting the friends conference for multiple selection - buttonSetEnabled("call_btn", multiple_selected); + buttonSetEnabled("call_btn", multiple_selected && LLVoiceClient::voiceEnabled()); buttonSetEnabled("share_btn", item_selected); // not implemented yet bool none_group_selected = item_selected && selected_id.isNull(); |