diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-27 14:06:44 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-27 14:06:44 +0200 |
| commit | 684cfb722e433c7625c7c945aca05e0154915c8f (patch) | |
| tree | e6980b612cc500274bf68131823baf8119bd63bc /indra | |
| parent | 8ea2c7a37380162ba2926bd23a01583023884408 (diff) | |
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
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 6 | ||||
| -rw-r--r-- | 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<LLContextMenu>( "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"> <menu_item_call.on_click function="Avatar.Call" /> + <menu_item_call.on_enable + function="ParticipantList.EnableItem" + parameter="can_call" /> </menu_item_call> <menu_item_call enabled="true" |