diff options
| author | Richard Linden <none@none> | 2010-08-12 10:10:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 10:10:09 -0700 |
| commit | 73952a37ed7a11331154f2f68050286722ec96da (patch) | |
| tree | 7ce6c9f6d0c3f6b0e85efc57736340106329beb4 /indra/llcommon/lldate.cpp | |
| parent | e16c1f6fdd300f284f0b39b76b4e82f7366b5cdb (diff) | |
| parent | 402e2a181831d30a6a2586fd4b0641ba66da99be (diff) | |
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/llcommon/lldate.cpp')
| -rw-r--r-- | indra/llcommon/lldate.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp index a7ef28b431..04583cdd4a 100644 --- a/indra/llcommon/lldate.cpp +++ b/indra/llcommon/lldate.cpp @@ -121,7 +121,12 @@ std::string LLDate::toHTTPDateString (tm * gmt, std::string fmt) // use strftime() as it appears to be faster than std::time_put char buffer[128]; strftime(buffer, 128, fmt.c_str(), gmt); - return std::string(buffer); + std::string res(buffer); +#if LL_WINDOWS + // Convert from locale-dependant charset to UTF-8 (EXT-8524). + res = ll_convert_string_to_utf8_string(res); +#endif + return res; } void LLDate::toStream(std::ostream& s) const |