diff options
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 9dfc7bcee7..f739e159f3 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -422,18 +422,8 @@ void LLFavoritesBarCtrl::showDropDownMenu() if(menu) { - if (menu->getClosedByButtonClick()) - { - menu->resetClosedByButtonClick(); - return; - } - - if (menu->getVisible()) - { - menu->setVisible(FALSE); - menu->resetClosedByButtonClick(); + if (!menu->toggleVisibility()) return; - } LLInventoryModel::item_array_t items; @@ -559,7 +549,7 @@ void LLFavoritesBarCtrl::onButtonRightClick( LLUUID item_id,LLView* fav_button,S LLMenuGL::showPopup(fav_button, menu, x, y); } -void copy_slurl_to_clipboard_cb(const LLVector3d& posGlobal, std::string& slurl) +void copy_slurl_to_clipboard_cb(std::string& slurl) { gClipboard.copyFromString(utf8str_to_wstring(slurl)); } |