diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 12:39:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-05 12:39:08 +0100 |
| commit | eef6ababcdd9ae4c9cbdc5dc295420fa66e753ab (patch) | |
| tree | 05ace450df0d21f24d2f9816f8f64059b3044c02 /indra/llcommon | |
| parent | 057568bddc178546c112d8223042a0ed2378ab8b (diff) | |
| parent | 7253c7eeb156f9f6cd75f52b0df856ec8ef165fb (diff) | |
merge from PE's 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 |