From ddcef5edafa7f636d2025d1d930720881c3411e0 Mon Sep 17 00:00:00 2001 From: David Seikel Date: Wed, 2 Mar 2011 23:27:49 +1000 Subject: There are other ways to tell if someone is age verified. Implimenting policy should be done server side. Plus, we abuse this in the meta 7 grid for our own purposes. --- linden/indra/newview/llpanelavatar.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'linden') 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**) { LLStringUtil::format_map_t args; caption_text = self->mPanelSecondLife->getString("CaptionTextAcctInfo"); - + const char* ACCT_TYPE[] = { "AcctTypeResident", "AcctTypeTrial", @@ -1921,8 +1921,8 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) args["[ACCTTYPE]"] = self->mPanelSecondLife->getString(ACCT_TYPE[caption_index]); std::string payment_text = " "; - const S32 DEFAULT_CAPTION_LINDEN_INDEX = 3; - if(caption_index != DEFAULT_CAPTION_LINDEN_INDEX) + const S32 DEFAULT_CAPTION_STAFF_INDEX = 3; + if(caption_index != DEFAULT_CAPTION_STAFF_INDEX) { if(transacted) { @@ -1938,14 +1938,12 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) } args["[PAYMENTINFO]"] = self->mPanelSecondLife->getString(payment_text); std::string age_text = age_verified ? "AgeVerified" : "NotAgeVerified"; - // Do not display age verification status at this time - //args["[[AGEVERIFICATION]]"] = self->mPanelSecondLife->getString(age_text); - args["[AGEVERIFICATION]"] = " "; + args["[AGEVERIFICATION]"] = self->mPanelSecondLife->getString(age_text); } else { - args["[PAYMENTINFO]"] = " "; - args["[AGEVERIFICATION]"] = " "; + args["[PAYMENTINFO]"] = "Payment info not needed"; + args["[AGEVERIFICATION]"] = "Gods see everything"; } LLStringUtil::format(caption_text, args); } -- cgit v1.1