diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-22 15:49:38 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-22 15:49:38 -0400 |
| commit | 48d9dc9a8ef0a6f4aa53fa1061463678cb9de0c7 (patch) | |
| tree | 67bf6082ce2ef92e1b4e4fad326473332d0841a8 /indra/llui/lltoggleablemenu.cpp | |
| parent | 01a229ecdf466bc183ad68b130b0bb2befcc1e6a (diff) | |
| parent | 63d04204a99802d3200452e101d9bb1b898be881 (diff) | |
merge
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 d29260750f..e4d1a37569 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; } |