diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-10 15:32:57 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-10 15:32:57 -0400 |
| commit | d65d451448573f95b065a9be7c88ff239d5ed8be (patch) | |
| tree | 7734e1017a9bb81f4073ffa7839bba39dbde7ab1 /indra/newview/llfolderview.cpp | |
| parent | 22795e0a8da1bd99a5bb0e4df62b684eb2fc3931 (diff) | |
| parent | a15701de33007f60994181d8e7300d1e624de373 (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. |