diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 18:51:23 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 18:51:23 -0800 |
| commit | c9044c03b3157c330a0b3b640bfce6bacc0c9343 (patch) | |
| tree | d22f74cf380629ef398eea71d937646bfd726a40 /indra/llui/lltoggleablemenu.cpp | |
| parent | 1786a7150e754ea10dfd5172ec2491dd67e83a9a (diff) | |
| parent | 8a3384adafff1b34d5a903e4d8cfd2dabca9e243 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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; } |