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

SL-18058 Post-merge functionality restore #2

master
Andrey Kleshchev 2024-01-03 00:38:57 +02:00
parent 7838c14d87
commit 096156d16c
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llavatariconctrl.cpp
View File

@ -299,7 +299,13 @@ bool LLAvatarIconCtrl::updateFromCache()
//virtual
void LLAvatarIconCtrl::processProperties(void* data, EAvatarProcessorType type)
{
if (APT_PROPERTIES_LEGACY == type)
// Both APT_PROPERTIES_LEGACY and APT_PROPERTIES have icon data.
// 'Legacy' is cheaper to request so LLAvatarIconCtrl issues that,
// but own icon should track any source for the sake of timely updates.
//
// If this needs to change, make sure to update onCommitProfileImage
// to issue right kind of request
if (APT_PROPERTIES_LEGACY == type)
{
LLAvatarLegacyData* avatar_data = static_cast<LLAvatarLegacyData*>(data);
if (avatar_data)
@ -313,6 +319,20 @@ void LLAvatarIconCtrl::processProperties(void* data, EAvatarProcessorType type)
updateFromCache();
}
}
else if (APT_PROPERTIES == type)
{
LLAvatarData* avatar_data = static_cast<LLAvatarData*>(data);
if (avatar_data)
{
if (avatar_data->avatar_id != mAvatarId)
{
return;
}
LLAvatarIconIDCache::getInstance()->add(mAvatarId, avatar_data->image_id);
updateFromCache();
}
}
}
void LLAvatarIconCtrl::onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name)

2
indra/newview/llpanelprofile.cpp
View File

@ -1806,7 +1806,7 @@ void LLPanelProfileSecondLife::onCommitProfileImage(const LLUUID& id)
if (result)
{
LLAvatarIconIDCache::getInstance()->add(gAgentID, id);
// Should trigger callbacks in icon controls
// Should trigger callbacks in icon controls (or request Legacy)
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(gAgentID);
}
};