summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-05 12:42:12 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-05 12:42:12 +0100
commitb68f753a756598287a19f8bb50ede4ea02f93ede (patch)
tree961a61ff2a369fa719f6c4a622fdd347165b5320 /indra/llcommon
parent55e9785e7bcbdb4152c8145a32a9552d3e0b629f (diff)
parenteef6ababcdd9ae4c9cbdc5dc295420fa66e753ab (diff)
(hairy) merge from viewer-release
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/lldate.cpp7
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