From 08654cc859980ff9444842cea4ec8ce49a4d684a Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Tue, 17 Sep 2013 01:25:05 -0400
Subject: [PATCH] Fixed profile floater not displaying custom account type
 strings from server

---
 indra/newview/llpanelavatar.cpp               | 54 ++-----------------
 .../skins/default/xui/en-us/panel_avatar.xml  | 27 ----------
 .../skins/default/xui/en-us/strings.xml       | 17 ++++--
 3 files changed, 19 insertions(+), 79 deletions(-)

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 4cda01c3b..2c6e5a057 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -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);
 
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 284576ba1..9c59c900e 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -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"
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 07151f0f9..4e6a1eba7 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -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>