diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-11 08:06:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-11 08:06:22 -0400 |
| commit | 9f704b61adcf8aad9dc58b77ccb75a1b9f34bf91 (patch) | |
| tree | 199803a238d464a97be5d19c1701224ef8a38dba /indra/newview/llinventorybridge.cpp | |
| parent | 3210b0922e53daea2fc5f09212e9a4f429295ec2 (diff) | |
| parent | 80f2836a424520ebe022464bde709362303fa7ad (diff) | |
merge beta tags
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 cebe93f042..c0065a94e6 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -73,7 +73,7 @@ #include "llwearablelist.h" // Marketplace outbox current disabled -#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 0 +#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1 #define ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU 0 #define BLOCK_WORN_ITEMS_IN_OUTBOX 1 |