diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-16 20:39:40 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-16 20:39:40 +0000 |
| commit | 5e9e67cb2d1d3dfc82dfe96103270b2341991ddd (patch) | |
| tree | 2df2a064523b2bffef6ff7566399c76b1f2cc196 /indra/newview/llviewerwindow.cpp | |
| parent | 1ada34fc0c5dc20bffba231ef513b569dbec32ea (diff) | |
merge -r 59028:59178 maintenance -> release.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 36c08321ed..a2dadcc438 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2172,7 +2172,9 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask) } // don't pass keys on to world when something in ui has focus - return gFocusMgr.childHasKeyboardFocus(mRootView) || (gMenuBarView && gMenuBarView->getHighlightedItem()); + return gFocusMgr.childHasKeyboardFocus(mRootView) + || LLMenuGL::getKeyboardMode() + || (gMenuBarView && gMenuBarView->getHighlightedItem() && gMenuBarView->getHighlightedItem()->isActive()); } |