diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-04 14:06:36 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-04 14:06:36 -0800 |
| commit | 1c4474f8945316118870d7d8389d6bfb619ad239 (patch) | |
| tree | 0b9aa54bd789f94c9270600199738e7432366472 /indra/llcommon | |
| parent | 912833bafa9a59734432787158e36b66ee9586aa (diff) | |
| parent | 377a9ab9ac3b098492cbd010f3091c713ac6dc83 (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llstring.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index e7fe656808..1193a4ef8d 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -1122,6 +1122,11 @@ bool LLStringUtil::formatDatetime(std::string& replacement, std::string token, struct tm * gmt = gmtime (&loc_seconds); replacement = LLStringOps::sMonthList[gmt->tm_mon]; } + else if(LLStringOps::sMonthShortList.size() == 12 && code == "%b") + { + struct tm * gmt = gmtime (&loc_seconds); + replacement = LLStringOps::sMonthShortList[gmt->tm_mon]; + } else if( !LLStringOps::sDayFormat.empty() && code == "%d" ) { struct tm * gmt = gmtime (&loc_seconds); |