diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-11 13:38:19 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-11 13:38:19 -0400 |
| commit | f1e907ecbeb43d56066bc365a4550931dfc5e7eb (patch) | |
| tree | 5642c656a58e6c68897b6196c2991892c4009d00 /indra/newview/llfolderview.cpp | |
| parent | d7f123ab526df7dbef153e0de71f325ab1b69571 (diff) | |
| parent | be251b06eb785a2d301115f9c231eb5f3c906224 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 8b72d83830..9ba5f827e2 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -1723,7 +1723,7 @@ BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char) } BOOL handled = FALSE; - if (gFocusMgr.childHasKeyboardFocus(getRoot())) + if (mParentPanel->hasFocus()) { // SL-51858: Key presses are not being passed to the Popup menu. // A proper fix is non-trivial so instead just close the menu. |