diff options
| author | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
| commit | a87b99cd950de20dc55e1ae6ce7186863a554326 (patch) | |
| tree | 43d1385397cbefac07934588824a3d0716fc6365 /indra/newview/llpanelpeople.cpp | |
| parent | b26694f2ab4d88fb8a0e4b1f0e8733f111af4522 (diff) | |
| parent | c74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff) | |
Merge, fixed conflict in panel_preferences_sound.xml
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(); |