diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2019-08-12 09:58:08 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2019-08-12 09:58:08 -0400 |
commit | 5a72d34b7676031da35f93c91eda3eab01085aff (patch) | |
tree | 4677bc0b7330af7ff142d286eb4feee5126a8d7e /indra/llui/lltoggleablemenu.cpp | |
parent | f0fa4f94a5400fe5d21cf5bf7570129916bf9787 (diff) | |
parent | 98be6e141c1232bad28cc115bc7092f175b18809 (diff) |
Automated merge with file:///Users/nat/linden/viewer-catch
Diffstat (limited to 'indra/llui/lltoggleablemenu.cpp')
-rw-r--r-- | indra/llui/lltoggleablemenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltoggleablemenu.cpp b/indra/llui/lltoggleablemenu.cpp index ccb92ffbb2..3e56e0a589 100644 --- a/indra/llui/lltoggleablemenu.cpp +++ b/indra/llui/lltoggleablemenu.cpp @@ -55,7 +55,7 @@ boost::signals2::connection LLToggleableMenu::setVisibilityChangeCallback(const void LLToggleableMenu::onVisibilityChange (BOOL curVisibilityIn) { S32 x,y; - LLUI::getMousePositionLocal(LLUI::getRootView(), &x, &y); + LLUI::getInstance()->getMousePositionLocal(LLUI::getInstance()->getRootView(), &x, &y); // STORM-1879: also check MouseCapture to see if the button was really // clicked (otherwise the VisibilityChange was triggered via keyboard shortcut) |