diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-20 15:18:49 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-20 15:18:49 -0700 |
| commit | eb3a643f3bcddb159622e2d38ef65f661b204653 (patch) | |
| tree | c33e9db5e102f3099091a0e90fdfc26ad1e8db42 /indra/newview/llfolderview.cpp | |
| parent | 3df9545017a4835e162801d3e8a13d68c8bc44ad (diff) | |
| parent | 938f1b4f41683e1a3aaa424d3d7bac5b0772d09c (diff) | |
Merge from viewer-experience
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. |