diff options
| author | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-20 17:18:46 -0800 |
|---|---|---|
| committer | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-20 17:18:46 -0800 |
| commit | 3ea3f52aedd1efc568b01c8f618c5bbe805f61db (patch) | |
| tree | 11790cd07a5ebc39b16c409956d7bf900424f7f1 /indra/newview/llpanelavatar.cpp | |
| parent | 1d5775a23fbcf00ad3e459393a7cf1d80a762bf8 (diff) | |
| parent | 1d9d099baae1b502f4fae02238330c06bf49adb2 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
| -rw-r--r-- | indra/newview/llpanelavatar.cpp | 8 |
1 files changed, 6 insertions, 2 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); |