diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-09 09:56:52 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-09 09:56:52 -0800 |
| commit | 1422be8312fcf19cbeecda8c109ea1e7b11eaa49 (patch) | |
| tree | 7d78e1590126e849750755ab73f09edf8de9bc17 /indra/llcommon/llstring.cpp | |
| parent | c98bf3cd509dd7bf10837713a911f9932c476e1f (diff) | |
| parent | 3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/llcommon/llstring.cpp')
| -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); |