diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-06 16:40:03 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-06 16:40:03 +0300 |
| commit | ad567ec19db66aabc1e0ee950dc80620a50a4833 (patch) | |
| tree | cff91519619728f5da8bf3a28429361472bc3c85 /indra/llcommon/lldate.cpp | |
| parent | dc1b42e31fe2ff9f7d20fdace7f74bb451918c5d (diff) | |
| parent | c87f7716c9456e476e0f668f52a2b818c5f32759 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 |