diff options
author | Kent Quirk <q@lindenlab.com> | 2007-11-15 19:10:29 +0000 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2007-11-15 19:10:29 +0000 |
commit | 138bf17c3c51cbf3826a05887d73c49908025f95 (patch) | |
tree | d47a36708813b3f93b4049d822f966c48de4e576 /indra/newview/llpanelavatar.cpp | |
parent | c1920e3c1c60fb792cf091750b05de618b355878 (diff) |
merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
-rw-r--r-- | indra/newview/llpanelavatar.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 706e05328c..5b43497f03 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -1788,6 +1788,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) //BOOL mature = FALSE; BOOL identified = FALSE; BOOL transacted = FALSE; + BOOL age_verified = FALSE; BOOL online = FALSE; char profile_url[DB_USER_PROFILE_URL_BUF_SIZE]; /*Flawfinder: ignore*/ @@ -1825,6 +1826,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) identified = (flags & AVATAR_IDENTIFIED); transacted = (flags & AVATAR_TRANSACTED); + age_verified = (flags & AVATAR_AGEVERIFIED); allow_publish = (flags & AVATAR_ALLOW_PUBLISH); online = (flags & AVATAR_ONLINE); @@ -1874,6 +1876,12 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) payment_text = "NoPaymentInfoOnFile"; } args["[PAYMENTINFO]"] = self->mPanelSecondLife->childGetValue(payment_text).asString(); + LLString age_text = "NotAgeVerified"; + if(age_verified) + { + age_text = "AgeVerified"; + } + args["[PAYMENTINFO]"] += self->mPanelSecondLife->childGetValue(age_text).asString(); } else { |