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

Restore fix for SL-18058

master
Ansariel 2023-12-18 19:15:23 +01:00
parent cfffabbc62
commit 0f29365711
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpanelavatar.cpp
View File

@ -143,7 +143,7 @@ void LLPanelProfileTab::setApplyProgress(bool started)
}
}
static void put_avatar_properties_coro(std::string cap_url, LLUUID agent_id, LLSD data)
static void put_avatar_properties_coro(std::string cap_url, LLUUID agent_id, LLSD data, std::function<void(bool)> callback)
{
LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
@ -166,11 +166,18 @@ static void put_avatar_properties_coro(std::string cap_url, LLUUID agent_id, LLS
LL_WARNS("AvatarProperties") << "Failed to put agent information " << data << " for id " << agent_id << LL_ENDL;
return;
}
else
{
LL_DEBUGS("AvatarProperties") << "Agent id: " << agent_id << " Data: " << data << " Result: " << httpResults << LL_ENDL;
}
LL_DEBUGS("AvatarProperties") << "Agent id: " << agent_id << " Data: " << data << " Result: " << httpResults << LL_ENDL;
if (callback)
{
callback(status);
}
}
bool LLPanelProfileTab::saveAgentUserInfoCoro(std::string name, LLSD value) const
bool LLPanelProfileTab::saveAgentUserInfoCoro(std::string name, LLSD value, std::function<void(bool)> callback) const
{
std::string cap_url = gAgent.getRegionCapability("AgentProfile");
if (cap_url.empty())
@ -180,7 +187,7 @@ bool LLPanelProfileTab::saveAgentUserInfoCoro(std::string name, LLSD value) cons
}
LLCoros::instance().launch("putAgentUserInfoCoro",
boost::bind(put_avatar_properties_coro, cap_url, getAvatarId(), LLSD().with(name, value)));
boost::bind(put_avatar_properties_coro, cap_url, getAvatarId(), LLSD().with(name, value), callback));
return true;
}

2
indra/newview/llpanelavatar.h
View File

@ -133,7 +133,7 @@ protected:
const bool getSelfProfile() const { return mSelfProfile; }
bool saveAgentUserInfoCoro(std::string name, LLSD value) const;
bool saveAgentUserInfoCoro(std::string name, LLSD value, std::function<void(bool)> callback = nullptr) const;
public:
void setIsLoading() { mLoadingState = PROFILE_LOADING; }

12
indra/newview/llpanelprofile.cpp
View File

@ -2393,7 +2393,17 @@ void LLPanelProfileSecondLife::onCommitProfileImage(const LLUUID& id)
if (!gAgent.getRegionCapability(PROFILE_PROPERTIES_CAP).empty())
{
if (!saveAgentUserInfoCoro("sl_image_id", id))
std::function<void(bool)> callback = [id](bool result)
{
if (result)
{
LLAvatarIconIDCache::getInstance()->add(gAgentID, id);
// Should trigger callbacks in icon controls
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(gAgentID);
}
};
if (!saveAgentUserInfoCoro("sl_image_id", id, callback))
return;
mImageId = id;