Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed profile floater not displaying custom account type strings from server

Browse Source
This commit is contained in:
Drake Arconis
2013-09-17 01:25:05 -04:00
parent 3f1d05b839
commit 08654cc859
3 changed files with 19 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
indra/newview/llpanelavatar.cpp
View File

@@ -46,6 +46,7 @@
#include "llagent.h"
#include "llavataractions.h"
#include "llavatarpropertiesprocessor.h"
#include "llcallingcard.h"
#include "lldroptarget.h"
#include "llfloatergroupinfo.h"
@@ -183,56 +184,11 @@ void LLPanelAvatarSecondLife::processProperties(void* data, EAvatarProcessorType
if (pAvatarData && (mAvatarID == pAvatarData->avatar_id) && (pAvatarData->avatar_id != LLUUID::null))
{
LLStringUtil::format_map_t args;
U8 caption_index = 0;
std::string caption_text = getString("CaptionTextAcctInfo");
const char* ACCT_TYPE[] =
{
"AcctTypeResident",
"AcctTypeTrial",
"AcctTypeCharterMember",
"AcctTypeEmployee"
};
caption_index = llclamp(caption_index, (U8)0, (U8)(LL_ARRAY_SIZE(ACCT_TYPE)-1));
args["[ACCTTYPE]"] = getString(ACCT_TYPE[caption_index]);
args["[ACCTTYPE]"] = LLAvatarPropertiesProcessor::accountType(pAvatarData);
args["[PAYMENTINFO]"] = LLAvatarPropertiesProcessor::paymentInfo(pAvatarData);
args["[AGEVERIFICATION]"] = " ";
std::string payment_text = " ";
const S32 DEFAULT_CAPTION_LINDEN_INDEX = 3;
if(caption_index != DEFAULT_CAPTION_LINDEN_INDEX)
{
if(pAvatarData->flags & AVATAR_TRANSACTED)
{
payment_text = "PaymentInfoUsed";
}
else if (pAvatarData->flags & AVATAR_IDENTIFIED)
{
payment_text = "PaymentInfoOnFile";
}
else
{
payment_text = "NoPaymentInfoOnFile";
}
args["[PAYMENTINFO]"] = getString(payment_text);
// Do not display age verification status at this time - Mostly because it /doesn't work/. -HgB
/*bool age_verified = (pAvatarData->flags & AVATAR_AGEVERIFIED); // Not currently getting set in dataserver/lldataavatar.cpp for privacy consideration
std::string age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
args["[AGEVERIFICATION]"] = getString(age_text);
*/
args["[AGEVERIFICATION]"] = " ";
}
else
{
args["[PAYMENTINFO]"] = " ";
args["[AGEVERIFICATION]"] = " ";
}
LLStringUtil::format(caption_text, args);
childSetValue("acct", caption_text);
getChild<LLUICtrl>("acct")->setValue(getString("CaptionTextAcctInfo", args));
getChild<LLTextureCtrl>("img")->setImageAssetID(pAvatarData->image_id);

27
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -9,33 +9,6 @@
[PAYMENTINFO]
[AGEVERIFICATION]
</string>
<string name="AcctTypeResident">
Resident
</string>
<string name="AcctTypeTrial">
Trial
</string>
<string name="AcctTypeCharterMember">
Charter Member
</string>
<string name="AcctTypeEmployee">
Linden Lab Employee
</string>
<string name="PaymentInfoUsed">
Payment Info Used
</string>
<string name="PaymentInfoOnFile">
Payment Info On File
</string>
<string name="NoPaymentInfoOnFile">
No Payment Info On File
</string>
<string name="AgeVerified">
Age-verified
</string>
<string name="NotAgeVerified">
Not Age-verified
</string>
<button bottom="-24" follows="left|top" halign="right" height="16" label="Copy Key:" left="4" font="SansSerifSmall" tool_tip="Copy key to clipboard" name="copy_key" width="70"/>
<name_editor bevel_style="in" border_style="line"
border_thickness="1" bottom="-24" enabled="false" follows="left|top"

17
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -3205,10 +3205,21 @@ The
<string name="Stomach">Stomach</string>
<string name="Left Pec">Left Pec</string>
<string name="Right Pec">Right Pec</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<string name="Neck">Neck</string>
<string name="Root">Root</string>
<string name="Invalid Attachment">Invalid Attachment Point</string>
<!-- Account types, see LLAvatarPropertiesProcessor -->
<string name="AcctTypeResident">Resident</string>
<string name="AcctTypeTrial">Trial</string>
<string name="AcctTypeCharterMember">Charter Member</string>
<string name="AcctTypeEmployee">Linden Lab Employee</string>
<string name="PaymentInfoUsed">Payment Info Used</string>
<string name="PaymentInfoOnFile">Payment Info On File</string>
<string name="NoPaymentInfoOnFile">No Payment Info On File</string>
<string name="AgeVerified">Age-verified</string>
<string name="NotAgeVerified">Not Age-verified</string>
<!-- HUD Position -->
<string name="Center 2">Center 2</string>
<string name="Top Right">Top Right</string>