diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-08 11:22:52 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-02-08 11:22:52 -0500 |
| commit | 635a264e6f76f33a05694c069635653cd19de5d9 (patch) | |
| tree | 4e46ca17587c2fe0c75b9749f67486f4d8359bd6 /indra/newview/llinventorybridge.cpp | |
| parent | b13fe12fb950f714a2e2fd97708a3baef39ef285 (diff) | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (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 c0065a94e6..cebe93f042 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 1 +#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 0 #define ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU 0 #define BLOCK_WORN_ITEMS_IN_OUTBOX 1 |