diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-23 19:12:31 +0000 |
| commit | 7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch) | |
| tree | 99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/newview/llviewerwindow.cpp | |
| parent | 47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff) | |
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index dc00fe7585..77c6794dfe 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -349,6 +349,12 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window, LLCoordGL pos, MASK mask llinfos << "ViewerWindow left mouse down at " << x << "," << y << llendl; } + if (gMenuBarView) + { + // stop ALT-key access to menu + gMenuBarView->resetMenuTrigger(); + } + mLeftMouseDown = TRUE; // Make sure we get a coresponding mouseup event, even if the mouse leaves the window @@ -617,6 +623,12 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window, LLCoordGL pos, MASK llinfos << "ViewerWindow right mouse down at " << x << "," << y << llendl; } + if (gMenuBarView) + { + // stop ALT-key access to menu + gMenuBarView->resetMenuTrigger(); + } + mRightMouseDown = TRUE; // Make sure we get a coresponding mouseup event, even if the mouse leaves the window @@ -2514,7 +2526,7 @@ BOOL LLViewerWindow::handlePerFrameHover() } } - if (tool != gToolNull && tool != gToolInspect && tool != gToolCamera && tool != gToolDragAndDrop && !gSavedSettings.getBOOL("FreezeTime")) + if (tool != gToolNull && tool != gToolInspect && tool != gToolDragAndDrop && !gSavedSettings.getBOOL("FreezeTime")) { LLMouseHandler *captor = gFocusMgr.getMouseCapture(); // With the null, inspect, or drag and drop tool, don't muck @@ -2679,6 +2691,7 @@ BOOL LLViewerWindow::handlePerFrameHover() && !gMenuHolder->hasVisibleMenu() && !LLFloaterLand::floaterVisible() && !LLFloaterBuyLand::isOpen() + && !LLPanelLandGeneral::buyPassDialogVisible() && (!gFloaterTools || !gFloaterTools->getVisible())) { gParcelMgr->deselectLand(); |