From 684cfb722e433c7625c7c945aca05e0154915c8f Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Wed, 27 Jan 2010 14:06:44 +0200 Subject: Work on critical bug EXT-4725 (Viewer crashes if try to call from 'Nearby voice' floater) - reverted workaround implemented in the d1e9333a6203 changeset. Bug will be fixed in the correct way. --HG-- branch : product-engine --- indra/newview/llparticipantlist.cpp | 6 ------ indra/newview/skins/default/xui/en/menu_participant_list.xml | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index d54cbfe203..f83f3eba96 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -433,12 +433,6 @@ LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu() LLContextMenu* main_menu = LLUICtrlFactory::getInstance()->createFromFile( "menu_participant_list.xml", LLMenuGL::sMenuContainer, LLViewerMenuHolderGL::child_registry_t::instance()); - // AD *TODO: This is workaround for EXT-4725- way to properly enable/disable "Call" menu item in - // enableContextMenuItem() should be found. - bool not_agent = mUUIDs.front() != gAgentID; - bool can_call = not_agent && LLVoiceClient::voiceEnabled() && gVoiceClient->voiceWorking(); - main_menu->setItemEnabled("Call", can_call); - // Don't show sort options for P2P chat bool is_sort_visible = (mParent.mAvatarList && mParent.mAvatarList->size() > 1); main_menu->setItemVisible("SortByName", is_sort_visible); diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index 04e02d0f6c..805ffbae66 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml @@ -57,6 +57,9 @@ name="Call"> +