livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Leslie Linden 2011-12-20 14:41:30 -08:00
parent 11e192d9a7
commit 2a3b7f295f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llinventorybridge.cpp
View File

@ -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;