diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-10 10:14:17 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-10 10:14:17 -0800 |
| commit | f6a1858884958a67e68227d8078076681e7d478d (patch) | |
| tree | 9c1e1caf3ee0126eb140ba8dde42c664615e15ac /indra/newview/llpanelpeople.cpp | |
| parent | 9b4d09471cca6922257a27ba9cb70498ab81fd94 (diff) | |
| parent | 3e13bc913f3e527b1a9d4f500ad038c06cdf6525 (diff) | |
Merge with product-engine
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(); |