diff options
author | callum_linden <none@none> | 2015-05-26 14:03:07 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2015-05-26 14:03:07 -0700 |
commit | 80c67487c062b3105395d8dbf3dfc0be15cc678f (patch) | |
tree | 67e8aec40d3cd58030d28e1929bf09dcb75b96bc /indra/newview/llinventorybridge.h | |
parent | 80aa29eaec78d267b4fa1822cfbd3a33b268066a (diff) | |
parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) |
Merge with viewer-release after layer-limits release
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rwxr-xr-x | indra/newview/llinventorybridge.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index f8ef15991d..300cef7deb 100755 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -37,6 +37,7 @@ #include "llviewerwearable.h" #include "lltooldraganddrop.h" #include "lllandmarklist.h" +#include "llfolderviewitem.h" class LLInventoryFilter; class LLInventoryPanel; @@ -689,4 +690,11 @@ void hide_context_entries(LLMenuGL& menu, const menuentry_vec_t &entries_to_show, const menuentry_vec_t &disabled_entries); +class LLFolderViewGroupedItemBridge: public LLFolderViewGroupedItemModel +{ +public: + LLFolderViewGroupedItemBridge(); + virtual void groupFilterContextMenu(folder_view_item_deque& selected_items, LLMenuGL& menu); +}; + #endif // LL_LLINVENTORYBRIDGE_H |