diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-03-13 16:38:23 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-03-13 16:38:23 -0400 |
| commit | fb072c91485a484e3d0740113ee753b58c439900 (patch) | |
| tree | f01ed448852e8093be5909e5190a612ca09269ea /indra/llui/llfolderview.cpp | |
| parent | 738195a98d3009becd5dbeaae7f77e70fff7de3e (diff) | |
MAINT-4980 WIP - add context menu filtering based on the selection group
Diffstat (limited to 'indra/llui/llfolderview.cpp')
| -rwxr-xr-x | indra/llui/llfolderview.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 26cb90505d..7f0d486981 100755 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -171,7 +171,8 @@ LLFolderView::LLFolderView(const Params& p) mDraggingOverItem(NULL), mStatusTextBox(NULL), mShowItemLinkOverlays(p.show_item_link_overlays), - mViewModel(p.view_model) + mViewModel(p.view_model), + mGroupedItemModel(p.grouped_item_model) { claimMem(mViewModel); LLPanel* panel = p.parent_panel; @@ -1828,6 +1829,19 @@ void LLFolderView::updateMenuOptions(LLMenuGL* menu) flags = multi_select_flag; } + if (getFolderViewGroupedItemModel()) + { + getFolderViewGroupedItemModel()->groupFilterContextMenu(mSelectedItems,*menu); + } +#if 0 + selected_items_t::iterator item_itor = mSelectedItems.begin(); + if (item_itor != mSelectedItems.end()) + { + LLFolderViewItem* selected_item = (*item_itor); + selected_item->getViewModelItem()->groupFilterContextMenu(mSelectedItems,*menu); + } +#endif + addNoOptions(menu); } |