diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 04:24:35 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 04:24:35 +0200 |
commit | 91fa31c065a582b9ead8a3d2f537c9b3d72474ee (patch) | |
tree | 50a83e42321a2b611df7c8e3f72ef452f868c591 /indra/llui/llcombobox.cpp | |
parent | 2d69438ee37a2224698418c2d00b19015b70b2b5 (diff) | |
parent | f13cc44f8999a9897c77411d1296582b7bc1f08d (diff) |
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r-- | indra/llui/llcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index b2ad38bddf..c7f0326ed4 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -668,7 +668,7 @@ void LLComboBox::showList() mButton->setToggleState(TRUE); mList->setVisible(TRUE); - LLUI::addPopup(this); + LLUI::getInstance()->addPopup(this); setUseBoundingRect(TRUE); // updateBoundingRect(); @@ -694,7 +694,7 @@ void LLComboBox::hideList() mList->mouseOverHighlightNthItem(-1); setUseBoundingRect(FALSE); - LLUI::removePopup(this); + LLUI::getInstance()->removePopup(this); // updateBoundingRect(); } } |