From 98f071aa6fc2961d9a86fa1d174c1f988a6ef8dc Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Wed, 11 Jan 2012 11:59:34 -0800
Subject: [PATCH] EXP-1790 FIX -- Hitting return on item in Merchant Outbox
wears the object
* Disabled the "openItem" function on outbox items to prevent default behavior
when the return button is pressed.
---
indra/newview/llpanelmarketplaceoutboxinventory.cpp | 5 +++++
indra/newview/llpanelmarketplaceoutboxinventory.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/indra/newview/llpanelmarketplaceoutboxinventory.cpp b/indra/newview/llpanelmarketplaceoutboxinventory.cpp
index c14a0c83790..ff62cb23dbb 100644
--- a/indra/newview/llpanelmarketplaceoutboxinventory.cpp
+++ b/indra/newview/llpanelmarketplaceoutboxinventory.cpp
@@ -148,4 +148,9 @@ BOOL LLOutboxFolderViewItem::handleDoubleClick(S32 x, S32 y, MASK mask)
return TRUE;
}
+void LLOutboxFolderViewItem::openItem()
+{
+ // Intentionally do nothing to block attaching items from the outbox
+}
+
// eof
diff --git a/indra/newview/llpanelmarketplaceoutboxinventory.h b/indra/newview/llpanelmarketplaceoutboxinventory.h
index 167f371f0ec..a6c522b7c23 100644
--- a/indra/newview/llpanelmarketplaceoutboxinventory.h
+++ b/indra/newview/llpanelmarketplaceoutboxinventory.h
@@ -71,6 +71,7 @@ class LLOutboxFolderViewItem : public LLFolderViewItem
// virtual
BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+ void openItem();
};
--
GitLab