From d201f49ce38194477a73d515909e0a8dc25baf16 Mon Sep 17 00:00:00 2001
From: pavelkproductengine <pavelkproductengine@lindenlab.com>
Date: Thu, 4 Jun 2015 20:03:20 +0300
Subject: MAINT-5137 FIXED Warning sometimes appears at login - Alert: There
 was a problem Added logic to resend HTTP request for default perms saving

---
 indra/newview/llfloaterperms.cpp | 86 ++++++++++++++++++++++++++++++----------
 indra/newview/llfloaterperms.h   | 33 +++++++++++++++
 2 files changed, 98 insertions(+), 21 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index 042cf47070..04a818c2c0 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -166,15 +166,59 @@ void LLFloaterPermsDefault::onCommitCopy(const LLSD& user_data)
 	xfer->setEnabled(copyable);
 }
 
-class LLFloaterPermsResponder : public LLHTTPClient::Responder
+const int MAX_HTTP_RETRIES = 5;
+LLFloaterPermsRequester* LLFloaterPermsRequester::sPermsRequester = NULL;
+
+LLFloaterPermsRequester::LLFloaterPermsRequester(const std::string url, const LLSD report, 
+	int maxRetries)
+	: mRetriesCount(0), mMaxRetries(maxRetries), mUrl(url), mReport(report)
+{}
+
+//static 
+void LLFloaterPermsRequester::init(const std::string url, const LLSD report, int maxRetries)
+{
+	if (sPermsRequester == NULL) {
+		sPermsRequester = new LLFloaterPermsRequester(url, report, maxRetries);
+	}
+}
+    
+//static
+void LLFloaterPermsRequester::finalize()
+{
+	if (sPermsRequester != NULL)
+	{
+		delete sPermsRequester;
+		sPermsRequester = NULL;
+	}
+}
+
+//static
+LLFloaterPermsRequester* LLFloaterPermsRequester::instance()
+{
+	return sPermsRequester;
+}
+
+void LLFloaterPermsRequester::start()
 {
-public:
-	LLFloaterPermsResponder(): LLHTTPClient::Responder() {}
-private:
-	static	std::string sPreviousReason;
+	++mRetriesCount;
+	LLHTTPClient::post(mUrl, mReport, new LLFloaterPermsResponder());
+}
+    
+bool LLFloaterPermsRequester::retry()
+{
+	if (++mRetriesCount < mMaxRetries)
+	{
+		LLHTTPClient::post(mUrl, mReport, new LLFloaterPermsResponder());
+		return true;
+	}
+	return false;
+}
 
-	void httpFailure()
+void LLFloaterPermsResponder::httpFailure()
+{
+	if (!LLFloaterPermsRequester::instance() || !LLFloaterPermsRequester::instance()->retry())
 	{
+		LLFloaterPermsRequester::finalize();
 		const std::string& reason = getReason();
 		// Do not display the same error more than once in a row
 		if (reason != sPreviousReason)
@@ -185,27 +229,27 @@ private:
 			LLNotificationsUtil::add("DefaultObjectPermissions", args);
 		}
 	}
+}
 
-	void httpSuccess()
-	{
-		//const LLSD& content = getContent();
-		//dump_sequential_xml("perms_responder_result.xml", content);
-
-		// Since we have had a successful POST call be sure to display the next error message
-		// even if it is the same as a previous one.
-		sPreviousReason = "";
-		LLFloaterPermsDefault::setCapSent(true);
-		LL_INFOS("ObjectPermissionsFloater") << "Default permissions successfully sent to simulator" << LL_ENDL;
-	}
-};
+void LLFloaterPermsResponder::httpSuccess()
+{
+	//const LLSD& content = getContent();
+	//dump_sequential_xml("perms_responder_result.xml", content);
 
-	std::string	LLFloaterPermsResponder::sPreviousReason;
+	// Since we have had a successful POST call be sure to display the next error message
+	// even if it is the same as a previous one.
+	sPreviousReason = "";
+	LL_INFOS("ObjectPermissionsFloater") << "Default permissions successfully sent to simulator" << LL_ENDL;
+}
+
+std::string	LLFloaterPermsResponder::sPreviousReason;
 
 void LLFloaterPermsDefault::sendInitialPerms()
 {
 	if(!mCapSent)
 	{
 		updateCap();
+		setCapSent(true);
 	}
 }
 
@@ -230,8 +274,8 @@ void LLFloaterPermsDefault::updateCap()
             LLSDSerialize::toPrettyXML(report, sent_perms_log);
             LL_CONT << sent_perms_log.str() << LL_ENDL;
         }
-    
-		LLHTTPClient::post(object_url, report, new LLFloaterPermsResponder());
+        LLFloaterPermsRequester::init(object_url, report, MAX_HTTP_RETRIES);
+        LLFloaterPermsRequester::instance()->start();
 	}
     else
     {
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index 2bb0a19dc1..45ee510423 100755
--- a/indra/newview/llfloaterperms.h
+++ b/indra/newview/llfloaterperms.h
@@ -29,6 +29,7 @@
 #define LL_LLFLOATERPERMPREFS_H
 
 #include "llfloater.h"
+#include "llhttpclient.h"
 
 class LLFloaterPerms : public LLFloater
 {
@@ -89,4 +90,36 @@ private:
 	bool mNextOwnerTransfer[CAT_LAST];
 };
 
+class LLFloaterPermsRequester
+{
+public:
+	LLFloaterPermsRequester(const std::string url, const LLSD report, int maxRetries);
+
+	static void LLFloaterPermsRequester::init(const std::string url, const LLSD report, int maxRetries);
+	static void LLFloaterPermsRequester::finalize();
+	static LLFloaterPermsRequester* LLFloaterPermsRequester::instance();
+
+	void LLFloaterPermsRequester::start();
+	bool LLFloaterPermsRequester::retry();
+
+private:
+	int mRetriesCount;
+	int mMaxRetries;
+	const std::string mUrl;
+	const LLSD mReport;
+public:
+	static LLFloaterPermsRequester* sPermsRequester;
+};
+
+class LLFloaterPermsResponder : public LLHTTPClient::Responder
+{
+public:
+	LLFloaterPermsResponder() : LLHTTPClient::Responder() {}
+private:
+	static	std::string sPreviousReason;
+
+	void httpFailure();
+	void httpSuccess();
+};
+
 #endif
-- 
cgit v1.2.3