diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-20 14:41:30 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-20 14:41:30 -0800 |
| commit | 2a3b7f295fa82d5d4826cfd912fd07ebbe5f9c21 (patch) | |
| tree | 30a06de32d6a39d8d273f338533ec2104552516b | |
| parent | 11e192d9a72274d24e2a50799904c7a64ab33e27 (diff) | |
EXP-1755 FIX -- Can move items to Merchant Outbox during Outbox synch using Copy to Merchant Outbox context menu
* "Copy to Merchant Outbox" context menu option no longer available when marketplace import is in progress.
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 2ff6563a09..96c527859c 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -53,6 +53,7 @@ #include "llinventorymodel.h" #include "llinventorymodelbackgroundfetch.h" #include "llinventorypanel.h" +#include "llmarketplacefunctions.h" #include "llnotifications.h" #include "llnotificationsutil.h" #include "llpreviewanim.h" @@ -1132,6 +1133,15 @@ BOOL LLInvFVBridge::canListOnMarketplaceNow() const } } + // Do not allow listing while import is in progress + if (LLMarketplaceInventoryImporter::instanceExists()) + { + if (LLMarketplaceInventoryImporter::instance().isImportInProgress()) + { + can_list = FALSE; + } + } + #endif return can_list; |