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

LLDateUtil::ageFromDate() now takes more sensible parameters 

This and last reviewed with Kelly
master
James Cook 2010-04-20 16:06:25 -07:00
parent 6d1e44b033
commit 257c3ed2a3
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/lldateutil.cpp
View File

@ -59,8 +59,10 @@ static S32 days_from_month(S32 year, S32 month)
}
}
static std::string age_from_date(S32 born_year, S32 born_month, S32 born_day,
const LLDate& now)
std::string LLDateUtil::ageFromDate(S32 born_year,
S32 born_month,
S32 born_day,
const LLDate& now)
{
LLDate born_date;
born_date.fromYMDHMS(born_year, born_month, born_day);
@ -158,7 +160,7 @@ std::string LLDateUtil::ageFromDate(const std::string& date_string,
S32 born_month, born_day, born_year;
S32 matched = sscanf(date_string.c_str(), "%d/%d/%d", &born_month, &born_day, &born_year);
if (matched != 3) return "???";
return age_from_date(born_year, born_month, born_day, now);
return ageFromDate(born_year, born_month, born_day, now);
}
std::string LLDateUtil::ageFromDate(const std::string& date_string)
@ -173,15 +175,10 @@ std::string LLDateUtil::ageFromDateISO(const std::string& date_string,
S32 matched = sscanf(date_string.c_str(), "%d-%d-%d",
&born_year, &born_month, &born_day);
if (matched != 3) return "???";
return age_from_date(born_year, born_month, born_day, now);
return ageFromDate(born_year, born_month, born_day, now);
}
std::string LLDateUtil::ageFromDateISO(const std::string& date_string)
{
return ageFromDateISO(date_string, LLDate::now());
}
std::string LLDateUtil::ageFromDate(S32 year, S32 month, S32 day)
{
return age_from_date(year, month, day, LLDate::now());
}

2
indra/newview/lldateutil.h
View File

@ -51,7 +51,7 @@ namespace LLDateUtil
// Calls the above with LLDate::now()
std::string ageFromDateISO(const std::string& date_string);
std::string ageFromDate(S32 year, S32 month, S32 day);
std::string ageFromDate(S32 born_year, S32 born_month, S32 born_day, const LLDate& now);
}
#endif

3
indra/newview/llfloateravatarpicker.cpp
View File

@ -531,7 +531,8 @@ void LLFloaterAvatarPicker::processResponse(const LLUUID& query_id, const LLSD&
LLDate account_created = row["account_created"].asDate();
S32 year, month, day;
account_created.split(&year, &month, &day);
std::string age = LLDateUtil::ageFromDate(year, month, day);
std::string age =
LLDateUtil::ageFromDate(year, month, day, LLDate::now());
columns[2]["column"] = "age";
columns[2]["value"] = age;
search_results->addElement(item);