diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 11:59:34 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 11:59:34 -0800 |
| commit | 98f071aa6fc2961d9a86fa1d174c1f988a6ef8dc (patch) | |
| tree | 04b771b3d690c6e6469e65ed19bf7bb1f76c4d84 | |
| parent | 0a1cb4f03ee1aeb0cfc9d9bdb837043d0f46f292 (diff) | |
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.
| -rw-r--r-- | indra/newview/llpanelmarketplaceoutboxinventory.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llpanelmarketplaceoutboxinventory.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanelmarketplaceoutboxinventory.cpp b/indra/newview/llpanelmarketplaceoutboxinventory.cpp index c14a0c8379..ff62cb23db 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 167f371f0e..a6c522b7c2 100644 --- a/indra/newview/llpanelmarketplaceoutboxinventory.h +++ b/indra/newview/llpanelmarketplaceoutboxinventory.h @@ -71,6 +71,7 @@ public: // virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + void openItem(); }; |