diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-07 13:27:32 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-07 13:27:32 -0800 |
| commit | dac026a7d6ad932ef185b4e5c5b5efd7b059e911 (patch) | |
| tree | 3bc77c79429e9bf82bd661fae7ea5609d7da75f7 /indra | |
| parent | 560aba3aa4d5eb2c65132db4da355adae82a47f0 (diff) | |
CHUI-735 : Fixed! Handle the backspace case, suppress the search string handling from LLFolderView (it's in the search edit field now).
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llfolderview.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 3 |
2 files changed, 3 insertions, 14 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index dca14cc48f..8feaf654f0 100644 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -1275,20 +1275,6 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask ) break; } - if (!handled && mParentPanel->hasFocus()) - { - if (key == KEY_BACKSPACE) - { - mSearchTimer.reset(); - if (mSearchString.size()) - { - mSearchString.erase(mSearchString.size() - 1, 1); - } - search(getCurSelectedItem(), mSearchString, FALSE); - handled = TRUE; - } - } - return handled; } diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 0653a097f5..578b83fd28 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -1367,6 +1367,9 @@ BOOL LLInventoryPanel::handleKeyHere( KEY key, MASK mask ) } break; case KEY_DELETE: + case KEY_BACKSPACE: + // Delete selected items if delete or backspace key hit on the inventory panel + // Note: on Mac laptop keyboards, backspace and delete are one and the same if (mask == MASK_NONE) { LLInventoryAction::doToSelected(mInventory, mFolderRoot, "delete"); |