From 1b550aaec246063090fe7143145d69eebfbd4680 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 11 Oct 2007 00:28:42 +0000 Subject: EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release --- indra/newview/llfolderview.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 38f2249329..a68b937093 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -3678,6 +3678,14 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent ) { BOOL handled = FALSE; + // SL-51858: Key presses are not being passed to the Popup menu. + // A proper fix is non-trivial so instead just close the menu. + LLMenuGL* menu = (LLMenuGL*)LLView::getViewByHandle(mPopupMenuHandle); + if (menu->isOpen()) + { + LLMenuGL::sMenuContainer->hideMenus(); + } + LLView *item = NULL; if (getChildCount() > 0) { -- cgit v1.3