Merge with tip of viewer-release

1 files changed, 33 insertions, 0 deletions

diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h
index 2bb0a19dc1..d3b52c1fe5 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 init(const std::string url, const LLSD report, int maxRetries);
+	static void finalize();
+	static LLFloaterPermsRequester* instance();
+
+	void start();
+	bool 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