diff options
Diffstat (limited to 'linden/indra/newview/llpanelavatar.cpp')
-rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index dc2f14f..5b43497 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
@@ -69,6 +69,7 @@ | |||
69 | #include "lltooldraganddrop.h" | 69 | #include "lltooldraganddrop.h" |
70 | #include "lluiconstants.h" | 70 | #include "lluiconstants.h" |
71 | #include "llvoavatar.h" | 71 | #include "llvoavatar.h" |
72 | #include "llviewercontrol.h" | ||
72 | #include "llviewermenu.h" // *FIX: for is_agent_friend() | 73 | #include "llviewermenu.h" // *FIX: for is_agent_friend() |
73 | #include "llviewergenericmessage.h" // send_generic_message | 74 | #include "llviewergenericmessage.h" // send_generic_message |
74 | #include "llviewerobjectlist.h" | 75 | #include "llviewerobjectlist.h" |
@@ -76,7 +77,6 @@ | |||
76 | #include "llviewborder.h" | 77 | #include "llviewborder.h" |
77 | #include "llweb.h" | 78 | #include "llweb.h" |
78 | #include "llinventorymodel.h" | 79 | #include "llinventorymodel.h" |
79 | #include "viewer.h" // for gUserServer | ||
80 | #include "roles_constants.h" | 80 | #include "roles_constants.h" |
81 | 81 | ||
82 | #define kArraySize( _kArray ) ( sizeof( (_kArray) ) / sizeof( _kArray[0] ) ) | 82 | #define kArraySize( _kArray ) ( sizeof( (_kArray) ) / sizeof( _kArray[0] ) ) |
@@ -1788,6 +1788,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) | |||
1788 | //BOOL mature = FALSE; | 1788 | //BOOL mature = FALSE; |
1789 | BOOL identified = FALSE; | 1789 | BOOL identified = FALSE; |
1790 | BOOL transacted = FALSE; | 1790 | BOOL transacted = FALSE; |
1791 | BOOL age_verified = FALSE; | ||
1791 | BOOL online = FALSE; | 1792 | BOOL online = FALSE; |
1792 | char profile_url[DB_USER_PROFILE_URL_BUF_SIZE]; /*Flawfinder: ignore*/ | 1793 | char profile_url[DB_USER_PROFILE_URL_BUF_SIZE]; /*Flawfinder: ignore*/ |
1793 | 1794 | ||
@@ -1825,6 +1826,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) | |||
1825 | 1826 | ||
1826 | identified = (flags & AVATAR_IDENTIFIED); | 1827 | identified = (flags & AVATAR_IDENTIFIED); |
1827 | transacted = (flags & AVATAR_TRANSACTED); | 1828 | transacted = (flags & AVATAR_TRANSACTED); |
1829 | age_verified = (flags & AVATAR_AGEVERIFIED); | ||
1828 | allow_publish = (flags & AVATAR_ALLOW_PUBLISH); | 1830 | allow_publish = (flags & AVATAR_ALLOW_PUBLISH); |
1829 | online = (flags & AVATAR_ONLINE); | 1831 | online = (flags & AVATAR_ONLINE); |
1830 | 1832 | ||
@@ -1874,6 +1876,12 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) | |||
1874 | payment_text = "NoPaymentInfoOnFile"; | 1876 | payment_text = "NoPaymentInfoOnFile"; |
1875 | } | 1877 | } |
1876 | args["[PAYMENTINFO]"] = self->mPanelSecondLife->childGetValue(payment_text).asString(); | 1878 | args["[PAYMENTINFO]"] = self->mPanelSecondLife->childGetValue(payment_text).asString(); |
1879 | LLString age_text = "NotAgeVerified"; | ||
1880 | if(age_verified) | ||
1881 | { | ||
1882 | age_text = "AgeVerified"; | ||
1883 | } | ||
1884 | args["[PAYMENTINFO]"] += self->mPanelSecondLife->childGetValue(age_text).asString(); | ||
1877 | } | 1885 | } |
1878 | else | 1886 | else |
1879 | { | 1887 | { |