merge with 4.0.3-release

1 files changed, 16 insertions, 6 deletions

diff --git a/indra/newview/llmarketplacefunctions.h b/indra/newview/llmarketplacefunctions.h
index f8e7ed4364..9d795c6ced 100644
--- a/indra/newview/llmarketplacefunctions.h
+++ b/indra/newview/llmarketplacefunctions.h
@@ -37,8 +37,6 @@
 #include "llstring.h"
 
 
-LLSD getMarketplaceStringSubstitutions();
-
 
 namespace MarketplaceErrorCodes
 {
@@ -183,6 +181,8 @@ class LLSLMDeleteListingsResponder;
 class LLMarketplaceData
     : public LLSingleton<LLMarketplaceData>
 {
+    friend class LLSingleton < LLMarketplaceData > ;
+
 public:
 	friend class LLSLMGetMerchantResponder;
     friend class LLSLMGetListingsResponder;
@@ -192,9 +192,8 @@ public:
     friend class LLSLMAssociateListingsResponder;
     friend class LLSLMDeleteListingsResponder;
 
-	LLMarketplaceData();
-    virtual ~LLMarketplaceData();
-    
+    static LLSD getMarketplaceStringSubstitutions();
+
     // Public SLM API : Initialization and status
 	typedef boost::signals2::signal<void ()> status_updated_signal_t;
     void initializeSLM(const status_updated_signal_t::slot_type& cb);
@@ -241,8 +240,11 @@ public:
     // Used to decide when to run a validation on listing folders
     void setValidationWaiting(const LLUUID& folder_id, S32 count);
     void decrementValidationWaiting(const LLUUID& folder_id, S32 count = 1);
-    
+
 private:
+    LLMarketplaceData();
+    virtual ~LLMarketplaceData();
+
     // Modify Marketplace data set  : each method returns true if the function succeeds, false if error
     // Used internally only by SLM Responders when data are received from the SLM Server
     bool addListing(const LLUUID& folder_id, S32 listing_id, const LLUUID& version_id, bool is_listed, const std::string& edit_url, S32 count);
@@ -261,6 +263,14 @@ private:
     void deleteSLMListing(S32 listing_id);
     std::string getSLMConnectURL(const std::string& route);
 
+    void getMerchantStatusCoro();
+    void getSLMListingsCoro(LLUUID folderId);
+    void getSingleListingCoro(S32 listingId, LLUUID folderId);
+    void createSLMListingCoro(LLUUID folderId, LLUUID versionId, S32 count);
+    void updateSLMListingCoro(LLUUID folderId, S32 listingId, LLUUID versionId, bool isListed, S32 count);
+    void associateSLMListingCoro(LLUUID folderId, S32 listingId, LLUUID versionId, LLUUID sourceFolderId);
+    void deleteSLMListingCoro(S32 listingId);
+
     // Handling Marketplace connection and inventory connection
 	U32  mMarketPlaceStatus;
 	status_updated_signal_t* mStatusUpdatedSignal;