diff options
| author | James Cook <james@lindenlab.com> | 2009-11-20 14:39:46 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-20 14:39:46 -0800 |
| commit | 67c832d94b53fb5d32ec27eebf7f57b668e899db (patch) | |
| tree | 57d5b6d268a54270e244baa5c218f145a555d1c3 /indra | |
| parent | ad02019d71741ce571599cdeef900430384b82dd (diff) | |
EXT-1743 People inspectors should show Age, not Date born
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile.xml | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index 2254684f21..03401d934f 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -38,6 +38,7 @@ #include "llavatarconstants.h" // AVATAR_ONLINE #include "llcallingcard.h" #include "llcombobox.h" +#include "lldateutil.h" // ageFromDate() #include "llimview.h" #include "lltexteditor.h" #include "lltexturectrl.h" @@ -466,8 +467,11 @@ void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data) //remove avatar id from cache to get fresh info LLAvatarIconIDCache::getInstance()->remove(avatar_data->avatar_id); - - childSetValue("register_date", avatar_data->born_on ); + LLStringUtil::format_map_t args; + args["[REG_DATE]"] = avatar_data->born_on; + args["[AGE]"] = LLDateUtil::ageFromDate( avatar_data->born_on, LLDate::now()); + std::string register_date = getString("RegisterDateFormat", args); + childSetValue("register_date", register_date ); childSetValue("sl_description_edit", avatar_data->about_text); childSetValue("fl_description_edit",avatar_data->fl_about_text); childSetValue("2nd_life_pic", avatar_data->image_id); diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 5110b6b2ef..bf1d46451b 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -27,7 +27,8 @@ <string name="no_partner_text" value="None" /> - <scroll_container + <string name="RegisterDateFormat">[REG_DATE] ([AGE])</string> + <scroll_container color="DkGray2" follows="all" height="485" |