From fd337f2c43470df43e4145fc4a88250688a45c97 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 4 May 2017 10:55:03 +0300
Subject: [PATCH] MAINT-7357 Disable delete function of the Backspace key on
Windows
---
indra/newview/llinventorypanel.cpp | 2 ++
indra/newview/llpanelobjectinventory.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index bd15ba49750..9de0633edb2 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -1482,7 +1482,9 @@ BOOL LLInventoryPanel::handleKeyHere( KEY key, MASK mask )
}
break;
case KEY_DELETE:
+#if LL_DARWIN
case KEY_BACKSPACE:
+#endif
// 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 (isSelectionRemovable() && (mask == MASK_NONE))
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 64096203369..dbfebf901a0 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -2052,7 +2052,9 @@ BOOL LLPanelObjectInventory::handleKeyHere( KEY key, MASK mask )
switch (key)
{
case KEY_DELETE:
+#if LL_DARWIN
case KEY_BACKSPACE:
+#endif
// 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 (isSelectionRemovable() && mask == MASK_NONE)
--
GitLab