summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-10-27 13:36:32 -0400
committerJonathan Yap <none@none>2011-10-27 13:36:32 -0400
commit252f851741a60f8d9c81870e48a6c7016c6db7a0 (patch)
treedfa9ec5f4be7a081ff2be1ab3237e97cf5635ba1
parent1b173ed82b65c7bb5f5d5294847a721b64f8cf35 (diff)
STORM-1659 dates reported as "2035" within groups
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/llpanelgrouplandmoney.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 988410701b..2989f4a5b7 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -581,6 +581,7 @@ Jonathan Yap
STORM-1639
STORM-910
STORM-1642
+ STORM-1659
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index 8477219f87..e66dd5690c 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -1431,7 +1431,7 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
LLSD substitution;
// We don't do time zone corrections of the calculated number of seconds
// because we don't have a full time stamp, only a date.
- substitution["datetime"] = LLDateUtil::secondsSinceEpochFromString("%m/%d/%Y", start_date);
+ substitution["datetime"] = LLDateUtil::secondsSinceEpochFromString("%Y-%m-%d", start_date);
LLStringUtil::format (time_str, substitution);
text.append(time_str);
@@ -1442,7 +1442,7 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
text.append(LLTrans::getString("NextStipendDay"));
time_str = date_format_str;
- substitution["datetime"] = LLDateUtil::secondsSinceEpochFromString("%m/%d/%Y", next_stipend_date);
+ substitution["datetime"] = LLDateUtil::secondsSinceEpochFromString("%Y-%m-%d", next_stipend_date);
LLStringUtil::format (time_str, substitution);
text.append(time_str);