summaryrefslogtreecommitdiff
path: root/indra/newview/llmarketplacefunctions.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
-rw-r--r--indra/newview/llmarketplacefunctions.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index b9e02a36b4..9c67c589b8 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -55,6 +55,7 @@ namespace LLMarketplaceImport
static std::string sMarketplaceCookie = "";
static bool sImportInProgress = false;
+ static bool sImportPostPending = false;
static bool sImportGetPending = false;
static U32 sImportResultStatus = 0;
static LLSD sImportResults = LLSD::emptyMap();
@@ -106,6 +107,7 @@ namespace LLMarketplaceImport
void completed(U32 status, const std::string& reason, const LLSD& content)
{
sImportInProgress = (status == MarketplaceErrorCodes::IMPORT_DONE);
+ sImportPostPending = false;
sImportResultStatus = status;
}
};
@@ -185,7 +187,7 @@ namespace LLMarketplaceImport
bool resultPending()
{
- return sImportGetPending;
+ return (sImportPostPending || sImportGetPending);
}
U32 getResultStatus()
@@ -226,7 +228,8 @@ namespace LLMarketplaceImport
void triggerImport()
{
- sImportInProgress = true;
+ sImportInProgress = true;
+ sImportPostPending = true;
sImportResultStatus = MarketplaceErrorCodes::IMPORT_PROCESSING;
sImportResults = LLSD::emptyMap();