summaryrefslogtreecommitdiff
path: root/indra/newview/llmarketplacefunctions.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-25 17:12:49 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-25 17:12:49 -0700
commit6d7b33f77e6d6facd585faf8c5d355f68942fcef (patch)
tree406956731f84eb55a1b41364c9c4b48e79385ac2 /indra/newview/llmarketplacefunctions.h
parentc00909603adc5981b05f4f9e31d067be64e8c6c2 (diff)
DD-22 : WIP : Implemented SLM API GET merchant, use it in initialization but glitch in UI (needs to reopen the floater to see content)
Diffstat (limited to 'indra/newview/llmarketplacefunctions.h')
-rwxr-xr-xindra/newview/llmarketplacefunctions.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llmarketplacefunctions.h b/indra/newview/llmarketplacefunctions.h
index a587419323..a71ccfd53e 100755
--- a/indra/newview/llmarketplacefunctions.h
+++ b/indra/newview/llmarketplacefunctions.h
@@ -145,6 +145,11 @@ class LLMarketplaceData
public:
LLMarketplaceData();
+ // SLM
+ U32 getSLMStatus() const { return mMarketPlaceStatus; }
+ void setSLMStatus(U32 status) { mMarketPlaceStatus = status; }
+ void initializeSLM();
+
bool isEmpty() { return (mMarketplaceItems.size() == 0); }
// Probe the Marketplace data set to identify folders
@@ -169,10 +174,11 @@ public:
bool setActivation(const LLUUID& folder_id, bool activate);
// Merov : Test method while waiting for SLM API
- S32 getTestMarketplaceID() { return mTestCurrentMarketplaceID++; }
+ S32 getTestMarketplaceID();
private:
marketplace_items_list_t mMarketplaceItems;
+ U32 mMarketPlaceStatus;
// Merov : This is for test only, waiting for SLM API
S32 mTestCurrentMarketplaceID;
};