diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-26 13:59:22 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-26 13:59:22 -0700 |
| commit | f01aa16298bf22d9882e8b690f672e20098547a6 (patch) | |
| tree | 52a1265902ffbc5268d1b666dbd939bceb189757 /indra/newview/llinventorybridge.cpp | |
| parent | 5c4812015624ca31664a5ceb4c8998156286bd80 (diff) | |
| parent | bc32f4e590a182c7c7627ee05de055ed5f8cb300 (diff) | |
Merge from dd repo
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 0e27bd81be..0e1e6265aa 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -71,7 +71,7 @@ #include "llwearablelist.h" // Marketplace outbox current disabled -#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 0 // keep in sync with ENABLE_INVENTORY_DISPLAY_OUTBOX, ENABLE_MERCHANT_OUTBOX_PANEL +#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1 // keep in sync with ENABLE_INVENTORY_DISPLAY_OUTBOX, ENABLE_MERCHANT_OUTBOX_PANEL typedef std::pair<LLUUID, LLUUID> two_uuids_t; typedef std::list<two_uuids_t> two_uuids_list_t; |