diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-03-25 15:25:35 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-03-25 15:25:35 +0200 |
| commit | 911472ed08490cbc08ba5009be82b247c51102a7 (patch) | |
| tree | f9d5efb2e0037e5b602f2be23120910c40b94919 /indra/newview/llinventorybridge.cpp | |
| parent | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (diff) | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
Merge with viewer-release
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 |