diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-21 14:25:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-21 14:25:48 -0700 |
| commit | 5ae6bbc848e0146bb4b5ea5dd4a5d26d2c5702ba (patch) | |
| tree | cfd1c052aef51bfa95298613a95fc78f64c3aefc /indra/newview/llfolderview.cpp | |
| parent | 7bc6e626f40a910b4a3e5b88161e96b9967bd24d (diff) | |
| parent | 305b65f6f600b81de9a78e1246d2a5353cc3189b (diff) | |
EXP-1207 : merge with viewer-experience-fui
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. |