diff options
| author | prep <none@none> | 2012-03-02 11:29:30 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-03-02 11:29:30 -0500 |
| commit | f5cebb27a72cf31723eb621bdcd117f7634a4e58 (patch) | |
| tree | 656bda206f1467c61d37acee3440020281440b06 /indra/newview/llinventorybridge.cpp | |
| parent | c2a7006413ea5e4a0bf7b8b75fe5afdb51e9a6e5 (diff) | |
| parent | e1e13bcab96565ddc7627139673519a09a60962f (diff) | |
merge
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 |