diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
| commit | aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch) | |
| tree | 5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/newview/llviewerwindow.cpp | |
| parent | dbf45ad4294a59c050982b5a417fe86272026454 (diff) | |
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index df396c93be..74a239e827 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -899,6 +899,12 @@ void LLViewerWindow::handleFocusLost(LLWindow *window) } gFocusMgr.setMouseCapture( NULL, NULL ); + if (gMenuBarView) + { + // stop ALT-key access to menu + gMenuBarView->resetMenuTrigger(); + } + // restore mouse cursor gViewerWindow->showCursor(); gViewerWindow->getWindow()->setMouseClipping(FALSE); @@ -2671,8 +2677,7 @@ BOOL LLViewerWindow::handlePerFrameHover() if (gParcelMgr && !LLFloaterLand::floaterVisible() && !LLFloaterBuyLand::isOpen() - && (!gFloaterTools || !gFloaterTools->getVisible()) - && !gToolMgr) + && (!gFloaterTools || !gFloaterTools->getVisible())) { gParcelMgr->deselectLand(); } |