diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 22:40:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 22:40:13 +0000 |
| commit | 3b65da1fad46eda2c97681879fce8880f7462082 (patch) | |
| tree | 9c9a5b69ea5f3d90883c39acdd0f856e75105fd1 /indra/newview/llfavoritesbar.cpp | |
| parent | 73caee4208a4e05f66583de099502012fd8415ea (diff) | |
merge -r 1341-1350 https://svn.aws.productengine.com/secondlife/pe/stable-1 -> viewer-2.0.0-3
EXT-456 EXT-480 EXT-481 EXT-497 EXT-498 EXT-509 EXT-511
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)); } |