diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 12:42:12 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 12:42:12 +0100 |
| commit | 476f5e064ea327b1e3426ba2efb5971ced8ba9b0 (patch) | |
| tree | 961a61ff2a369fa719f6c4a622fdd347165b5320 /indra/llcommon | |
| parent | ac787b54682cef5d11ff13fba46024030e7b1edb (diff) | |
| parent | eef6ababcdd9ae4c9cbdc5dc295420fa66e753ab (diff) | |
(hairy) merge from viewer-release
Diffstat (limited to 'indra/llcommon')
| -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 |