diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-16 17:52:41 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-16 17:52:41 +0200 |
| commit | 7e040000c6c3471f53011994d95bc3b3d721782d (patch) | |
| tree | 7db41f23e8eb73ee735e7338bec0ea7e5c11c2d2 /indra/newview/llpanelprofile.cpp | |
| parent | cf15fa72f719a50e008d4310c93ee17643db3313 (diff) | |
SL-16937 New Profile capability, updated charter_member #4
Diffstat (limited to 'indra/newview/llpanelprofile.cpp')
| -rw-r--r-- | indra/newview/llpanelprofile.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index d6f88047d1..5e85fa227e 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -161,15 +161,14 @@ void request_avatar_properties_coro(std::string cap_url, LLUUID agent_id) avatar_data->flags |= AVATAR_ALLOW_PUBLISH; } - if (result["charter_member"].asBoolean()) + avatar_data->caption_index = 0; + if (result.has("charter_member")) // won't be present if "caption" is set { - const S32 TYPE_CHARTER_MEMBER = 2; - avatar_data->caption_index = TYPE_CHARTER_MEMBER; + avatar_data->caption_index = result["charter_member"].asInteger(); } - else + else if (result.has("caption")) { - const S32 TYPE_RESIDENT = 0; // See ACCT_TYPE - avatar_data->caption_index = TYPE_RESIDENT; + avatar_data->caption_text = result["caption"].asString(); } panel = floater_profile->findChild<LLPanel>(PANEL_SECONDLIFE, TRUE); |