diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 14:04:17 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 14:04:17 -0500 |
| commit | 450dc713969e7122047217f3b7e0c36909ee4953 (patch) | |
| tree | 1263709c961ae57469eb66bbb4354812968c13bf | |
| parent | 5729441b46a546e7e201419c3011964c1e555269 (diff) | |
| parent | 252f851741a60f8d9c81870e48a6c7016c6db7a0 (diff) | |
merge changes for storm-1659
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llpanelgrouplandmoney.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index d719f64baf..8454dc2782 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -582,6 +582,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); |