diff options
-rw-r--r-- | linden/indra/newview/llpanelavatar.cpp | 22 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp index bfcc04a..1701f69 100644 --- a/linden/indra/newview/llpanelavatar.cpp +++ b/linden/indra/newview/llpanelavatar.cpp | |||
@@ -1882,6 +1882,28 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**) | |||
1882 | } | 1882 | } |
1883 | 1883 | ||
1884 | self->mPanelSecondLife->childSetValue("acct", caption_text); | 1884 | self->mPanelSecondLife->childSetValue("acct", caption_text); |
1885 | |||
1886 | //Chalice - Show avatar age in days. | ||
1887 | int year; | ||
1888 | int month; | ||
1889 | int day; | ||
1890 | sscanf(born_on.c_str(), "%d/%d/%d", &month, &day, &year); | ||
1891 | time_t now = time(NULL); | ||
1892 | struct tm * timeinfo; | ||
1893 | timeinfo = localtime(&now); | ||
1894 | timeinfo->tm_mon = --month; | ||
1895 | timeinfo->tm_year = year - 1900; | ||
1896 | timeinfo->tm_mday = day; | ||
1897 | time_t birth = mktime(timeinfo); | ||
1898 | std::stringstream numberString; | ||
1899 | numberString << (S32)(difftime(now, birth) / 86400); //(60*60*24) | ||
1900 | |||
1901 | LLStringUtil::format_map_t targs; | ||
1902 | targs["[DAYS]"] = numberString.str(); | ||
1903 | std::string born_msg = self->mPanelSecondLife->getString("days_old_text"); | ||
1904 | LLStringUtil::format(born_msg, targs); | ||
1905 | born_on += " "; | ||
1906 | born_on += born_msg; | ||
1885 | self->mPanelSecondLife->childSetValue("born", born_on); | 1907 | self->mPanelSecondLife->childSetValue("born", born_on); |
1886 | 1908 | ||
1887 | EOnlineStatus online_status = (online) ? ONLINE_STATUS_YES : ONLINE_STATUS_NO; | 1909 | EOnlineStatus online_status = (online) ? ONLINE_STATUS_YES : ONLINE_STATUS_NO; |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml index 1786dc4..5c794c0 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | |||
@@ -39,6 +39,9 @@ | |||
39 | <string name="copy_key_info"> | 39 | <string name="copy_key_info"> |
40 | Copied key for [AVATAR] to clipboard: [KEY] | 40 | Copied key for [AVATAR] to clipboard: [KEY] |
41 | </string> | 41 | </string> |
42 | <string name="days_old_text"> | ||
43 | ([DAYS] days old) | ||
44 | </string> | ||
42 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 45 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
43 | bottom="-23" drop_shadow_visible="true" follows="left|top" | 46 | bottom="-23" drop_shadow_visible="true" follows="left|top" |
44 | font="SansSerifsmall" h_pad="0" halign="left" height="16" left="262" | 47 | font="SansSerifsmall" h_pad="0" halign="left" height="16" left="262" |