diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-10-19 20:58:35 +0200 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2023-10-20 01:46:42 +0200 |
| commit | b83b4e08482fc2d1aa635aa20a9ffadf21fa17bc (patch) | |
| tree | 3acb012c8feecdd2f52ec5d2796083088a3187b4 | |
| parent | 537cb9117125f621f34b4d44e3f16a9c8c30313c (diff) | |
SL-20163 Rework hide_age in processAvatarPropertiesReply()
| -rw-r--r-- | indra/newview/llavatarpropertiesprocessor.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/llavatarpropertiesprocessor.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp index cc5fa949af..8be5d370b3 100644 --- a/indra/newview/llavatarpropertiesprocessor.cpp +++ b/indra/newview/llavatarpropertiesprocessor.cpp @@ -426,24 +426,25 @@ void LLAvatarPropertiesProcessor::processAvatarPropertiesReply(LLMessageSystem* msg->getString( _PREHASH_PropertiesData, _PREHASH_ProfileURL, avatar_data.profile_url); msg->getU32Fast( _PREHASH_PropertiesData, _PREHASH_Flags, avatar_data.flags); - LLDateUtil::dateFromPDTString(avatar_data.born_on, birth_date); + // Since field 'hide_age' is not supported by msg system we'd better hide the age here + avatar_data.hide_age = TRUE; avatar_data.caption_index = 0; S32 charter_member_size = 0; charter_member_size = msg->getSize(_PREHASH_PropertiesData, _PREHASH_CharterMember); - if(1 == charter_member_size) + if (1 == charter_member_size) { msg->getBinaryData(_PREHASH_PropertiesData, _PREHASH_CharterMember, &avatar_data.caption_index, 1); } - else if(1 < charter_member_size) + else if (1 < charter_member_size) { msg->getString(_PREHASH_PropertiesData, _PREHASH_CharterMember, avatar_data.caption_text); } LLAvatarPropertiesProcessor* self = getInstance(); // Request processed, no longer pending self->removePendingRequest(avatar_data.avatar_id, APT_PROPERTIES); - self->notifyObservers(avatar_data.avatar_id,&avatar_data,APT_PROPERTIES); + self->notifyObservers(avatar_data.avatar_id, &avatar_data, APT_PROPERTIES); } void LLAvatarPropertiesProcessor::processAvatarInterestsReply(LLMessageSystem* msg, void**) @@ -619,7 +620,7 @@ void LLAvatarPropertiesProcessor::processAvatarGroupsReply(LLMessageSystem* msg, self->notifyObservers(avatar_groups.avatar_id,&avatar_groups,APT_GROUPS); } -void LLAvatarPropertiesProcessor::notifyObservers(const LLUUID& id,void* data, EAvatarProcessorType type) +void LLAvatarPropertiesProcessor::notifyObservers(const LLUUID& id, void* data, EAvatarProcessorType type) { // Copy the map (because observers may delete themselves when updated?) LLAvatarPropertiesProcessor::observer_multimap_t observers = mObservers; @@ -633,7 +634,7 @@ void LLAvatarPropertiesProcessor::notifyObservers(const LLUUID& id,void* data, E const LLUUID &agent_id = oi->first; if (agent_id == id || agent_id.isNull()) { - oi->second->processProperties(data,type); + oi->second->processProperties(data, type); } } } diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h index 0f8b1dd130..57e492f810 100644 --- a/indra/newview/llavatarpropertiesprocessor.h +++ b/indra/newview/llavatarpropertiesprocessor.h @@ -86,8 +86,8 @@ struct LLAvatarData U8 caption_index; std::string caption_text; std::string customer_type; - bool hide_age; U32 flags; + bool hide_age; }; struct LLAvatarPicks |