From dac026a7d6ad932ef185b4e5c5b5efd7b059e911 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 7 Feb 2013 13:27:32 -0800
Subject: [PATCH] CHUI-735 : Fixed! Handle the backspace case, suppress the
search string handling from LLFolderView (it's in the search edit field now).
---
indra/llui/llfolderview.cpp | 14 --------------
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 dca14cc48fa..8feaf654f05 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 0653a097f53..578b83fd280 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");
--
GitLab