diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2019-11-14 15:19:55 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2019-11-14 15:19:55 -0700 |
| commit | e9c0a93f99c4e6a4844da1a93ac261c4b206b79b (patch) | |
| tree | 5efd1b87123998a25d0aeb8a33232aae64fff284 /indra/newview/llflyoutcombobtn.cpp | |
| parent | dc1453af9c474c67749aded576c11dff3afdd444 (diff) | |
Fix merge-related compile errors
Diffstat (limited to 'indra/newview/llflyoutcombobtn.cpp')
| -rw-r--r-- | indra/newview/llflyoutcombobtn.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llflyoutcombobtn.cpp b/indra/newview/llflyoutcombobtn.cpp index 48bfb85072..e4f1d9fcaa 100644 --- a/indra/newview/llflyoutcombobtn.cpp +++ b/indra/newview/llflyoutcombobtn.cpp @@ -121,7 +121,7 @@ void LLFlyoutComboBtnCtrl::setMenuItemLabel(const std::string &item, const std:: void LLFlyoutComboBtnCtrl::onFlyoutButton(LLUICtrl *ctrl, const LLSD &data) { S32 x, y; - LLUI::getMousePositionLocal(mParent, &x, &y); + LLUI::getInstance()->getMousePositionLocal(mParent, &x, &y); mFlyoutMenu->updateParent(LLMenuGL::sMenuContainer); LLMenuGL::showPopup(mParent, mFlyoutMenu, x, y); |