diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-10 14:04:45 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-10 14:04:45 -0500 |
| commit | 9dfcc83098efec8590c3bdb19da76092955b7e0a (patch) | |
| tree | 7bb5f7c32c99f79d36d648fda6d732769503ed53 /indra/newview/llpanelpeople.cpp | |
| parent | 0d186b07121b110bf86a36cd157359f0733a5ee4 (diff) | |
| parent | f6a1858884958a67e68227d8078076681e7d478d (diff) | |
automated merge viewer2.0->viewer2.0
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(); |