livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable the experience purchase button based on the sim providing purchase info.

meow-7.2.2
dolphin 2014-05-09 10:26:06 -07:00
parent d331db79c2
commit bb5e0f7877
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llfloaterexperiences.cpp
View File

@ -47,11 +47,13 @@ class LLExperienceListResponder : public LLHTTPClient::Responder
{
public:
typedef std::map<std::string, std::string> NameMap;
LLExperienceListResponder(const LLHandle<LLFloaterExperiences>& parent, NameMap& nameMap, const std::string& errorMessage="ErrorMessage"):mParent(parent),mErrorMessage(errorMessage)
{
mNameMap.swap(nameMap);
}
typedef boost::function<void(LLPanelExperiences*, const LLSD&)> Callback;
LLExperienceListResponder(const LLHandle<LLFloaterExperiences>& parent, NameMap& nameMap, const std::string& errorMessage="ErrorMessage"):mParent(parent),mErrorMessage(errorMessage)
{
mNameMap.swap(nameMap);
}
Callback mCallback;
LLHandle<LLFloaterExperiences> mParent;
NameMap mNameMap;
const std::string mErrorMessage;
@ -73,7 +75,10 @@ public:
{
const LLSD& ids = content[it->first];
tab->setExperienceList(ids);
tab->enableButton(ids.beginArray() == ids.endArray());
if(!mCallback.empty())
{
mCallback(tab, content);
}
}
}
++it;
@ -298,6 +303,11 @@ void LLFloaterExperiences::onClose( bool app_quitting )
LLFloater::onClose(app_quitting);
}
void LLFloaterExperiences::checkPurchaseInfo(LLPanelExperiences* panel, const LLSD& content) const
{
panel->enableButton(content.has("purchase"));
}
void LLFloaterExperiences::sendPurchaseRequest() const
{
LLViewerRegion* region = gAgent.getRegion();
@ -308,6 +318,8 @@ void LLFloaterExperiences::sendPurchaseRequest() const
LLExperienceListResponder::NameMap nameMap;
nameMap["experience_ids"]="Owned_Experiences_Tab";
LLHTTPClient::post(url, content, new LLExperienceListResponder(getDerivedHandle<LLFloaterExperiences>(), nameMap, "ExperienceAcquireFailed"));
LLExperienceListResponder* responder = new LLExperienceListResponder(getDerivedHandle<LLFloaterExperiences>(), nameMap, "ExperienceAcquireFailed");
responder->mCallback = boost::bind(&LLFloaterExperiences::checkPurchaseInfo, this, _1, _2);
LLHTTPClient::post(url, content, responder);
}
}

1
indra/newview/llfloaterexperiences.h
View File

@ -49,6 +49,7 @@ protected:
bool updatePermissions(const LLSD& permission);
void sendPurchaseRequest() const;
void checkPurchaseInfo(LLPanelExperiences* panel, const LLSD& content)const;
private:

6
indra/newview/skins/default/xui/en/floater_experiences.xml
View File

@ -4,9 +4,9 @@
can_close="true"
can_resize="true"
height="400"
width="300"
width="500"
min_height="300"
min_width="300"
min_width="500"
layout="topleft"
name="floater_experiences"
save_rect="true"
@ -18,7 +18,7 @@
top="3"
left="3"
layout="topleft"
width="294"
right="-3"
follows="all"
height="394"
name="xp_tabs">