summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-12-09 10:31:16 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-12-09 10:31:16 -0800
commita7b04c9dd44274b3548402de2f4a9b8bc20e3e50 (patch)
tree3827b3205f699fb25750f99200be286e4826ed8e /indra/newview/llinventorybridge.cpp
parent67f1321f31d5988e7b383cfbf4fbd6537f3d2710 (diff)
* Removed old inventory window outbox.
* Added centered progress indicator for outbox.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r--indra/newview/llinventorybridge.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 017dabe2ad..33b9af7a78 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 1 // keep in sync with ENABLE_MERCHANT_OUTBOX_PANEL
+#define ENABLE_MERCHANT_OUTBOX_CONTEXT_MENU 1
typedef std::pair<LLUUID, LLUUID> two_uuids_t;
typedef std::list<two_uuids_t> two_uuids_list_t;