From f31f817ee61fa0f8fc05d2caa24f7674852629e5 Mon Sep 17 00:00:00 2001
From: "Karl Stiefvater (qarl)" <qarl@lindenlab.com>
Date: Wed, 25 Nov 2009 13:10:09 -0600
Subject: [PATCH] retry asset upload failures.
---
indra/newview/llassetuploadresponders.cpp | 17 +++++++++++++++++
indra/newview/llassetuploadresponders.h | 2 ++
2 files changed, 19 insertions(+)
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index dddc6fef1c..6e32a91078 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -256,6 +256,7 @@ void LLAssetUploadResponder::result(const LLSD& content)
lldebugs << "LLAssetUploadResponder::result from capabilities" << llendl;
std::string state = content["state"];
+
if (state == "upload")
{
uploadUpload(content);
@@ -330,6 +331,22 @@ LLNewAgentInventoryResponder::LLNewAgentInventoryResponder(
{
}
+// virtual
+void LLNewAgentInventoryResponder::error(U32 statusNum, const std::string& reason)
+{
+ LLAssetUploadResponder::error(statusNum, reason);
+ LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, LLUUID(), FALSE);
+}
+
+
+//virtual
+void LLNewAgentInventoryResponder::uploadFailure(const LLSD& content)
+{
+ LLAssetUploadResponder::uploadFailure(content);
+
+ LLImportColladaAssetCache::getInstance()->assetUploaded(mVFileID, content["new_asset"], FALSE);
+}
+
//virtual
void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
{
diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h
index 929a7a5f74..c869988203 100644
--- a/indra/newview/llassetuploadresponders.h
+++ b/indra/newview/llassetuploadresponders.h
@@ -74,7 +74,9 @@ public:
const LLSD& post_data,
const std::string& file_name,
LLAssetType::EType asset_type);
+ virtual void error(U32 statusNum, const std::string& reason);
virtual void uploadComplete(const LLSD& content);
+ virtual void uploadFailure(const LLSD& content);
};
// A base class which goes through and performs some default
--
GitLab