summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-10-14 02:38:49 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-10-17 16:33:59 +0300
commitbae25942a7bee6540c252b0a449a0882859c8822 (patch)
tree03c7a087af9b90fb60b9015038493ed5319c33c1
parent633865320aee0b2e1c615f2d5a772e5ddc3d9ae2 (diff)
SL-20163 Fix missing flags
Just in case, this is not fully in use yet, mostly because requests for avatar icons will become very heavy due all that additional info
-rw-r--r--indra/newview/llavatarpropertiesprocessor.cpp26
1 files changed, 26 insertions, 0 deletions
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
index f43ada7abc..11609affcf 100644
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -325,9 +325,35 @@ void LLAvatarPropertiesProcessor::requestAvatarPropertiesCoro(std::string cap_ur
avatar_data.born_on = result["member_since"].asDate();
avatar_data.hide_age = result["hide_age"].asBoolean();
avatar_data.profile_url = getProfileURL(agent_id.asString());
+ avatar_data.customer_type = result["customer_type"].asString();
avatar_data.flags = 0;
+ if (result["online"].asBoolean())
+ {
+ avatar_data.flags |= AVATAR_ONLINE;
+ }
+ if (result["allow_publish"].asBoolean())
+ {
+ avatar_data.flags |= AVATAR_ALLOW_PUBLISH;
+ }
+ if (result["identified"].asBoolean())
+ {
+ avatar_data.flags |= AVATAR_IDENTIFIED;
+ }
+ if (result["transacted"].asBoolean())
+ {
+ avatar_data.flags |= AVATAR_TRANSACTED;
+ }
+
avatar_data.caption_index = 0;
+ if (result.has("charter_member")) // won't be present if "caption" is set
+ {
+ avatar_data.caption_index = result["charter_member"].asInteger();
+ }
+ else if (result.has("caption"))
+ {
+ avatar_data.caption_text = result["caption"].asString();
+ }
LLAvatarPropertiesProcessor* self = getInstance();
// Request processed, no longer pending