diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-03 13:22:22 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-03 13:22:22 -0700 |
| commit | fa3b55e68a00359f8b37b1225337e615b3f6da4d (patch) | |
| tree | a9aaa0404d8cbc4faff01b8a91a328122df984fb /indra/newview/llfolderview.cpp | |
| parent | 174e44ab1eec203b5bc26a463d40b6eaf7ac58df (diff) | |
| parent | 712d4585950230ebd5ba66b3c60982ebcf6ebce9 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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. |