diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-06 18:11:52 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-06 18:11:52 -0800 |
| commit | 7ed270ff9dfdbc905dbee70907d3057a5ae490e7 (patch) | |
| tree | bfad6888adf7d96eadbed5d94106be5cd31df97c /indra/llui | |
| parent | 418b0334f2ee92ce8b8958218c8d6db5ccc855f2 (diff) | |
CHUI-735 : Fixed! Move the delete key handling from the llfolderview to the llinventorypanel level.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 23 | ||||
| -rw-r--r-- | indra/llui/llfolderview.h | 3 |
2 files changed, 0 insertions, 26 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index c756ff84e1..dca14cc48f 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -1336,29 +1336,6 @@ BOOL LLFolderView::handleUnicodeCharHere(llwchar uni_char) } -BOOL LLFolderView::canDoDelete() const -{ - if (mSelectedItems.size() == 0) return FALSE; - - for (selected_items_t::const_iterator item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it) - { - if (!(*item_it)->getViewModelItem()->isItemRemovable()) - { - return FALSE; - } - } - return TRUE; -} - -void LLFolderView::doDelete() -{ - if(mSelectedItems.size() > 0) - { - removeSelectedItems(); - } -} - - BOOL LLFolderView::handleMouseDown( S32 x, S32 y, MASK mask ) { mKeyboardSelection = FALSE; diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h index 05b2abb9d3..11fccdace4 100644 --- a/indra/llui/llfolderview.h +++ b/indra/llui/llfolderview.h @@ -180,9 +180,6 @@ public: virtual BOOL canPaste() const; virtual void paste(); - virtual BOOL canDoDelete() const; - virtual void doDelete(); - LLFolderViewItem* getNextUnselectedItem(); // Public rename functionality - can only start the process |