aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llpanelavatar.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 6b3be29..7502c10 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1910,7 +1910,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
1910 { 1910 {
1911 LLStringUtil::format_map_t args; 1911 LLStringUtil::format_map_t args;
1912 caption_text = self->mPanelSecondLife->getString("CaptionTextAcctInfo"); 1912 caption_text = self->mPanelSecondLife->getString("CaptionTextAcctInfo");
1913 1913
1914 const char* ACCT_TYPE[] = { 1914 const char* ACCT_TYPE[] = {
1915 "AcctTypeResident", 1915 "AcctTypeResident",
1916 "AcctTypeTrial", 1916 "AcctTypeTrial",
@@ -1921,8 +1921,8 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
1921 args["[ACCTTYPE]"] = self->mPanelSecondLife->getString(ACCT_TYPE[caption_index]); 1921 args["[ACCTTYPE]"] = self->mPanelSecondLife->getString(ACCT_TYPE[caption_index]);
1922 1922
1923 std::string payment_text = " "; 1923 std::string payment_text = " ";
1924 const S32 DEFAULT_CAPTION_LINDEN_INDEX = 3; 1924 const S32 DEFAULT_CAPTION_STAFF_INDEX = 3;
1925 if(caption_index != DEFAULT_CAPTION_LINDEN_INDEX) 1925 if(caption_index != DEFAULT_CAPTION_STAFF_INDEX)
1926 { 1926 {
1927 if(transacted) 1927 if(transacted)
1928 { 1928 {
@@ -1938,14 +1938,12 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
1938 } 1938 }
1939 args["[PAYMENTINFO]"] = self->mPanelSecondLife->getString(payment_text); 1939 args["[PAYMENTINFO]"] = self->mPanelSecondLife->getString(payment_text);
1940 std::string age_text = age_verified ? "AgeVerified" : "NotAgeVerified"; 1940 std::string age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
1941 // Do not display age verification status at this time 1941 args["[AGEVERIFICATION]"] = self->mPanelSecondLife->getString(age_text);
1942 //args["[[AGEVERIFICATION]]"] = self->mPanelSecondLife->getString(age_text);
1943 args["[AGEVERIFICATION]"] = " ";
1944 } 1942 }
1945 else 1943 else
1946 { 1944 {
1947 args["[PAYMENTINFO]"] = " "; 1945 args["[PAYMENTINFO]"] = "Payment info not needed";
1948 args["[AGEVERIFICATION]"] = " "; 1946 args["[AGEVERIFICATION]"] = "Gods see everything";
1949 } 1947 }
1950 LLStringUtil::format(caption_text, args); 1948 LLStringUtil::format(caption_text, args);
1951 } 1949 }