diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-17 15:48:07 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-17 15:48:07 -0800 |
| commit | 61f3c1b41ddedc16f2026c62600475105621b305 (patch) | |
| tree | af2124f540a4ff55c08cec7038458e883747fe47 /indra/llui/lltoggleablemenu.cpp | |
| parent | 2d25eb18adc0c2c97c63a8e02f2274362672137c (diff) | |
| parent | c6a0f0ae1dec5ef2f7657d8c1ca07d85c1fef55d (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/llui/lltoggleablemenu.cpp')
| -rw-r--r-- | indra/llui/lltoggleablemenu.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lltoggleablemenu.cpp b/indra/llui/lltoggleablemenu.cpp index b4c6c6162b..00d52fe10d 100644 --- a/indra/llui/lltoggleablemenu.cpp +++ b/indra/llui/lltoggleablemenu.cpp @@ -57,7 +57,9 @@ void LLToggleableMenu::handleVisibilityChange (BOOL curVisibilityIn) S32 x,y; LLUI::getMousePositionLocal(LLUI::getRootView(), &x, &y); - if (!curVisibilityIn && mButtonRect.pointInRect(x, y)) + // STORM-1879: also check MouseCapture to see if the button was really + // clicked (otherwise the VisibilityChange was triggered via keyboard shortcut) + if (!curVisibilityIn && mButtonRect.pointInRect(x, y) && gFocusMgr.getMouseCapture()) { mClosedByButtonClick = true; } |