diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-19 16:46:26 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-19 16:46:26 -0800 |
| commit | 6c26fdea4d62f723c3bdbec9ded032e6d77301b8 (patch) | |
| tree | b0ed76288c76ea670d373122b8939d79afeba325 /indra/newview/llinventorybridge.cpp | |
| parent | a0929f39caba9c2b7be8184f217c8e2a811857eb (diff) | |
EXP-1741 FIX -- Learn more link goes to page not found from Outbox for user that is not a merchant an Agni
EXP-1746 FIX -- Update Outbox messaging
EXP-1748 FIX -- Close down on messaging with Spinner
MKT-3403 support -- viewer tooltips updated to match errors in marketplace
* Copy has been updated to match the design per Leo and Brooke
* Marketplace URL's have also been updated
* The outbox floater now reports a status string in the existing folder count control
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 7665ad6e88..4e26f09978 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -73,7 +73,7 @@ // Marketplace outbox current disabled #define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1 -#define BLOCK_WORN_ITEMS_IN_OUTBOX 0 +#define BLOCK_WORN_ITEMS_IN_OUTBOX 1 typedef std::pair<LLUUID, LLUUID> two_uuids_t; typedef std::list<two_uuids_t> two_uuids_list_t; |