Merged in lindenlab/viewer-release

1 files changed, 15 insertions, 1 deletions

diff --git a/indra/newview/llfloaterexperiences.h b/indra/newview/llfloaterexperiences.h
index 06fd6c93d6..6d0559af7c 100644
--- a/indra/newview/llfloaterexperiences.h
+++ b/indra/newview/llfloaterexperiences.h
@@ -28,6 +28,7 @@
 #define LL_LLFLOATEREXPERIENCES_H
 
 #include "llfloater.h"
+#include "llcorehttputil.h"
 
 class LLPanelExperiences;
 
@@ -41,6 +42,9 @@ public:
     virtual void onOpen(const LLSD& key);
     static LLFloaterExperiences* findInstance();
 protected:
+    typedef std::map<std::string, std::string> NameMap_t;
+    typedef boost::function<void(LLPanelExperiences*, const LLSD&)> Callback_t;
+
     void clearFromRecent(const LLSD& ids);
     void resizeToTabs();
 	/*virtual*/ BOOL	postBuild();
@@ -49,13 +53,23 @@ protected:
     LLPanelExperiences* addTab(const std::string& name, bool select);
 
     bool updatePermissions(const LLSD& permission);
-    void sendPurchaseRequest();
+	void sendPurchaseRequest();
 	void checkPurchaseInfo(LLPanelExperiences* panel, const LLSD& content)const;
     void checkAndOpen(LLPanelExperiences* panel, const LLSD& content) const;
 	void updateInfo(std::string experiences, std::string tab);
 
+    void retrieveExperienceList(const std::string &url, const LLHandle<LLFloaterExperiences> &hparent, const NameMap_t &tabMapping,
+        const std::string &errorNotify = std::string("ErrorMessage"), Callback_t cback = Callback_t());
+
+    void requestNewExperience(const std::string &url, const LLHandle<LLFloaterExperiences> &hparent, const NameMap_t &tabMapping,
+        const std::string &errorNotify, Callback_t cback);
+
 private:
+    typedef boost::function < LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t, LLCore::HttpRequest::ptr_t,
+        const std::string, LLCore::HttpOptions::ptr_t, LLCore::HttpHeaders::ptr_t) > invokationFn_t;
 
+    static void retrieveExperienceListCoro(std::string url, LLHandle<LLFloaterExperiences> hparent, 
+        NameMap_t tabMapping, std::string errorNotify, Callback_t cback, invokationFn_t invoker);
     std::vector<LLUUID> mPrepurchaseIds;
 };