diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-20 14:48:00 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-20 14:48:00 -0700 |
| commit | 5fab3253f941c0e25b4b86e29ab7a34c4325f825 (patch) | |
| tree | 8c79b64a284d18a2e316ee3fc881629dff35617d /indra/llcommon/lldate.cpp | |
| parent | ab320a12e62152907bbec150972a9ac8a0e244fb (diff) | |
| parent | cde71ddc88293a752787b710f6d03aba1ec0b15e (diff) | |
Merge from dessie/viewer-release
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 |