Skip to content
Snippets Groups Projects
Commit 9e8bbf09 authored by Paul Guslisty's avatar Paul Guslisty
Browse files

Fixed low bug EXT - 3255 (Call button is enabled in the People & Profile...

Fixed low bug EXT - 3255 (Call button is enabled in the People & Profile panels while voice is disabled)

--HG--
branch : product-engine
parent 86d8d353
Branches
Tags
No related merge requests found
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
#include "llfloaterworldmap.h" #include "llfloaterworldmap.h"
#include "llfloaterreg.h" #include "llfloaterreg.h"
#include "llnotificationsutil.h" #include "llnotificationsutil.h"
#include "llvoiceclient.h"
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLDropTarget // Class LLDropTarget
...@@ -395,6 +396,7 @@ void LLPanelProfileTab::updateButtons() ...@@ -395,6 +396,7 @@ void LLPanelProfileTab::updateButtons()
&& gAgent.isGodlike() || is_agent_mappable(getAvatarId()); && gAgent.isGodlike() || is_agent_mappable(getAvatarId());
childSetEnabled("show_on_map_btn", enable_map_btn); childSetEnabled("show_on_map_btn", enable_map_btn);
childSetEnabled("call", LLVoiceClient::voiceEnabled());
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
......
...@@ -775,7 +775,7 @@ void LLPanelPeople::updateButtons() ...@@ -775,7 +775,7 @@ void LLPanelPeople::updateButtons()
buttonSetEnabled("teleport_btn", friends_tab_active && item_selected && isFriendOnline(selected_uuids.front())); buttonSetEnabled("teleport_btn", friends_tab_active && item_selected && isFriendOnline(selected_uuids.front()));
buttonSetEnabled("view_profile_btn", item_selected); buttonSetEnabled("view_profile_btn", item_selected);
buttonSetEnabled("im_btn", multiple_selected); // allow starting the friends conference for multiple selection 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 buttonSetEnabled("share_btn", item_selected); // not implemented yet
bool none_group_selected = item_selected && selected_id.isNull(); bool none_group_selected = item_selected && selected_id.isNull();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment