livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-1743 People inspectors should show Age, not Date born

master
James Cook 2009-11-20 14:39:46 -08:00
parent ad02019d71
commit 67c832d94b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpanelavatar.cpp
View File

@ -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);

3
indra/newview/skins/default/xui/en/panel_profile.xml
View File

@ -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"