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

Add Firestorm team member badge

meow-7.2.2
Ansariel 2023-05-08 19:00:35 +02:00
parent 3dd973f247
commit 6353aef820
7 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/fsdata.cpp
View File

@ -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("<key>%s</key><!-- %s -->\n <integer>%d</integer>\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("<key>%s</key><!-- %s -->\n <integer>%d</integer>\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<LLUUID, S32>::iterator iter = mSupportAgents.find(avatar_id);
if (iter == mSupportAgents.end())
std::map<LLUUID, S32>::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<LLUUID, S32>::iterator iter = mSupportAgents.find(agent_id);
if (iter == mSupportAgents.end())
std::map<LLUUID, S32>::iterator iter = mTeamAgents.find(agent_id);
if (iter == mTeamAgents.end())
{
return false;
}
@ -879,7 +879,7 @@ void FSData::addAgents()
return;
}
for (std::map<LLUUID, S32>::iterator iter = mSupportAgents.begin(); iter != mSupportAgents.end(); ++iter)
for (std::map<LLUUID, S32>::iterator iter = mTeamAgents.begin(); iter != mTeamAgents.end(); ++iter)
{
if (iter->second & NO_SPAM)
{

2
indra/newview/fsdata.h
View File

@ -99,7 +99,7 @@ private:
void updateClientTagsLocal();
void onNameCache(const LLUUID& av_id, const LLAvatarName& av_name);
std::map<LLUUID, S32> mSupportAgents;
std::map<LLUUID, S32> mTeamAgents;
std::map<std::string, LLSD> mBlockedVersions;
LLSD mHeaders;

6
indra/newview/llpanelprofile.cpp
View File

@ -1635,6 +1635,12 @@ void LLPanelProfileSecondLife::fillAccountStatus(const LLAvatarData* avatar_data
//childSetVisible("partner_spacer_layout", FALSE);
setBadge("Profile_Badge_Pplus_Lifetime", "BadgePremiumPlusLifetime");
}
// <FS:Ansariel> Add Firestorm team badge
else if (FSData::getInstance()->getAgentFlags(avatar_data->avatar_id) != -1)
{
setBadge("Profile_Badge_Team", "BadgeTeam");
}
// </FS:Ansariel>
else
{
childSetVisible("badge_layout", FALSE);

BIN
indra/newview/skins/default/textures/icons/profile_badge_team.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
indra/newview/skins/default/textures/textures.xml
View File

@ -614,6 +614,7 @@ with the same filename but different name
<texture name="Profile_Badge_Linden" file_name="icons/profile_badge_linden.png" preload="true"/>
<texture name="Profile_Badge_Pplus_Lifetime" file_name="icons/profile_badge_pplus_lifetime.png" preload="true"/>
<texture name="Profile_Badge_Premium_Lifetime" file_name="icons/profile_badge_premium_lifetime.png" preload="true"/>
<texture name="Profile_Badge_Team" file_name="icons/profile_badge_team.png" preload="true"/>
<texture name="Profile_Group_Visibility_Off" file_name="icons/profile_group_visibility_eye_off.png" preload="true"/>
<texture name="Profile_Group_Visibility_Off_Pressed" file_name="icons/profile_group_visibility_eye_off_pressed.png" preload="true"/>
<texture name="Profile_Group_Visibility_On" file_name="icons/profile_group_visibility_eye_on.png" preload="true"/>

2
indra/newview/skins/default/xui/de/panel_profile_secondlife.xml
View File

@ -21,6 +21,8 @@
value="Premium Lebenszeit" />
<string name="BadgePremiumPlusLifetime"
value="Premium Plus Lebenszeit" />
<string name="BadgeTeam"
value="[APP_NAME]-Mitglied" />
<string name="payment_update_link_url">
http://www.secondlife.com/account/billing.php?lang=de
</string>

3
indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
View File

@ -51,6 +51,9 @@
<string
name="BadgePremiumPlusLifetime"
value="Premium Plus lifetime" />
<string
name="BadgeTeam"
value="[APP_NAME] member" />
<string
name="payment_update_link_url"
>