From 6353aef8200e8bf6725898e73824d1d35c0c434a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 8 May 2023 19:00:35 +0200 Subject: [PATCH] Add Firestorm team member badge --- indra/newview/fsdata.cpp | 24 +++++++++--------- indra/newview/fsdata.h | 2 +- indra/newview/llpanelprofile.cpp | 6 +++++ .../textures/icons/profile_badge_team.png | Bin 0 -> 1169 bytes .../skins/default/textures/textures.xml | 1 + .../xui/de/panel_profile_secondlife.xml | 2 ++ .../xui/en/panel_profile_secondlife.xml | 3 +++ 7 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/profile_badge_team.png diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp index d99f6363aa..ad7ae37544 100644 --- a/indra/newview/fsdata.cpp +++ b/indra/newview/fsdata.cpp @@ -524,8 +524,8 @@ void FSData::processAgents(const LLSD& data) for (LLSD::map_const_iterator iter = agents.beginMap(); iter != agents.endMap(); ++iter) { LLUUID key = LLUUID(iter->first); - mSupportAgents[key] = iter->second.asInteger(); - LL_DEBUGS("fsdata") << "Added " << key << " with " << mSupportAgents[key] << " flag mask to mSupportAgentList" << LL_ENDL; + mTeamAgents[key] = iter->second.asInteger(); + LL_DEBUGS("fsdata") << "Added " << key << " with " << mTeamAgents[key] << " flag mask to mSupportAgentList" << LL_ENDL; } } else if (data.has("SupportAgents")) // Legacy format @@ -535,19 +535,19 @@ void FSData::processAgents(const LLSD& data) for (LLSD::map_const_iterator iter = support_agents.beginMap(); iter != support_agents.endMap(); ++iter) { LLUUID key = LLUUID(iter->first); - mSupportAgents[key] = 0; + mTeamAgents[key] = 0; const LLSD& content = iter->second; if(content.has("support")) { - mSupportAgents[key] |= SUPPORT; + mTeamAgents[key] |= SUPPORT; } if(content.has("developer")) { - mSupportAgents[key] |= DEVELOPER; + mTeamAgents[key] |= DEVELOPER; } - LL_DEBUGS("fsdata") << "Added Legacy " << key << " with " << mSupportAgents[key] << " flag mask to mSupportAgentList" << LL_ENDL; - std::string text = llformat("%s\n %d\n", key.asString().c_str(), content["name"].asString().c_str(), mSupportAgents[key]); + LL_DEBUGS("fsdata") << "Added Legacy " << key << " with " << mTeamAgents[key] << " flag mask to mSupportAgentList" << LL_ENDL; + std::string text = llformat("%s\n %d\n", key.asString().c_str(), content["name"].asString().c_str(), mTeamAgents[key]); newFormat.append(text); } LL_DEBUGS("fsdata") << "New format for copy paste:\n" << newFormat << LL_ENDL; @@ -764,8 +764,8 @@ void FSData::saveLLSD(const LLSD& data, const std::string& filename, const LLDat S32 FSData::getAgentFlags(const LLUUID& avatar_id) { - std::map::iterator iter = mSupportAgents.find(avatar_id); - if (iter == mSupportAgents.end()) + std::map::iterator iter = mTeamAgents.find(avatar_id); + if (iter == mTeamAgents.end()) { return -1; } @@ -848,8 +848,8 @@ bool FSData::isTestingGroup(const LLUUID& id) bool FSData::isAgentFlag(const LLUUID& agent_id, flags_t flag) { - std::map::iterator iter = mSupportAgents.find(agent_id); - if (iter == mSupportAgents.end()) + std::map::iterator iter = mTeamAgents.find(agent_id); + if (iter == mTeamAgents.end()) { return false; } @@ -879,7 +879,7 @@ void FSData::addAgents() return; } - for (std::map::iterator iter = mSupportAgents.begin(); iter != mSupportAgents.end(); ++iter) + for (std::map::iterator iter = mTeamAgents.begin(); iter != mTeamAgents.end(); ++iter) { if (iter->second & NO_SPAM) { diff --git a/indra/newview/fsdata.h b/indra/newview/fsdata.h index fa17f34391..76926fa132 100644 --- a/indra/newview/fsdata.h +++ b/indra/newview/fsdata.h @@ -99,7 +99,7 @@ private: void updateClientTagsLocal(); void onNameCache(const LLUUID& av_id, const LLAvatarName& av_name); - std::map mSupportAgents; + std::map mTeamAgents; std::map mBlockedVersions; LLSD mHeaders; diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp index ccbf33df03..9c3ff6dcad 100644 --- a/indra/newview/llpanelprofile.cpp +++ b/indra/newview/llpanelprofile.cpp @@ -1635,6 +1635,12 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data //childSetVisible("partner_spacer_layout", FALSE); setBadge("Profile_Badge_Pplus_Lifetime", "BadgePremiumPlusLifetime"); } + // Add Firestorm team badge + else if (FSData::getInstance()->getAgentFlags(avatar_data->avatar_id) != -1) + { + setBadge("Profile_Badge_Team", "BadgeTeam"); + } + // else { childSetVisible("badge_layout", FALSE); diff --git a/indra/newview/skins/default/textures/icons/profile_badge_team.png b/indra/newview/skins/default/textures/icons/profile_badge_team.png new file mode 100644 index 0000000000000000000000000000000000000000..4af3c54366d9b18ac7d859f4f81c689a34bfdd0b GIT binary patch literal 1169 zcmV;C1aA9@P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA1SUyDK~y+TRa9MT z990;8&V20mPWH2#Pn)JDrHRB=YLaRwRYGmGH-=aQZ;D>1Sn%E(1@+ED&9h+h%1h5|2YZp zCXl2n%414Q%I=ip&UoGXD9bR&7?b^YoP~#m5Ik`Lp{GwldTIdWxXg@RMM*{Zz%e1d z3IzfeUjgJMkbElWhvk&=svKb%PZ5e*_L=N4SlokKH=yVh=y#^EHhlxD$ujCu6_FOf zA}c%|6k@m_%QqH$KQDI&kn8LTzpJGJL1)#5dq{>_;&6SAj9NibUqW?h7Bht+EGENN zeMn`FXn`XD)>0OtE9Cp%%V{CK)Skk)5`!c~H8>k4s;w$mkcQG6Ww(xXu0oG7aE&1p zC1F>6s5&ubU^dXc$Jn%dScs21T=aQi6*l8=A|bH-1{$d-EVqG@=b=`#5Kl-5X&h!z zz+SAQ;R8BpLqKY=sZks7iDrqIX8?&KF{l9#h$!HO1L67bq6!SsEJ(oH1W;YF!99VR zc+^C2R|ri`03XT%O3mh|?z`lrgs#Uka5;nAXh6wk5Rw&iba%pa!?3C*3<5AIK{ho3 zVTUnQ4g&8ffa1^xqt3CvR>a z1z$Ka1KuPstr<}wfmBvOZ>Ng>!61^EAZmsUjl#9M%ds$9z{{79V`Tgsa&1{WITVL$ znaJ0jHQEZpDlpJYl~3rAump?f8N_+vfk95iv0Y*)nH&v=W9(cndQM-!;iIJA;w-E^ z-Cr))lM>BL?gMVqf#%-pl##OOW0^9wx#MAFxq^qACQ20tv6cX|TpO4|_JN@<{`fUN z|HJL_+f!@2aPZ)$wlrXgp36v1LZUZD*{72fiFYh1;lfx3!_W4itu2DBpMSyj)NOHp z-J1XHugdFR->S_u0m!HSO3tVl)Kq+MCMBJHVJsa@ceFCCvmN21S;QlG)HY0i;ZD`K zxuXAAaK-zdf4jXzbHw@oKnF!Xw0JfbIP=U%`qGiU>}Wci$%Z6L=>FbzX-zz5)84Aqbkv00000NkvXXu0mjf#vL2s literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 4a5d1c0fe2..e6889305a6 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -614,6 +614,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml index bae901ae1a..bddfde5a7c 100644 --- a/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/de/panel_profile_secondlife.xml @@ -21,6 +21,8 @@ value="Premium Lebenszeit" /> + http://www.secondlife.com/account/billing.php?lang=de diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml index 21ef1b141b..b5dc88fe12 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml @@ -51,6 +51,9 @@ +