diff options
| author | Richard Linden <none@none> | 2012-01-12 12:54:46 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-12 12:54:46 -0800 |
| commit | 26829e6fa2de6e59f46ba340ca7ad6c430728470 (patch) | |
| tree | 6f33024f248c9128795697a5d00217a51fec19c6 /indra/llcommon | |
| parent | 37c68057c92f5a21a3d21b4ac01690a1cf4cf8e4 (diff) | |
| parent | 757a955bd700eb4f838762dcbe789a77ee052064 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llstring.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index 1193a4ef8d..e7fe656808 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -1122,11 +1122,6 @@ 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); |