summaryrefslogtreecommitdiff
path: root/indra/llcommon/llformat.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-23 09:51:15 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-23 09:51:15 +0100
commit77911533dc68731f50f40b18cd44e287df28f476 (patch)
treed2f08b7df7c836cf6d23551a0a97cf0769e1ec3a /indra/llcommon/llformat.h
parent7ee930ea4a5721077974bc5b24d8cc1c6b6a2fae (diff)
parent66bdd0903d1ded7a2e113938ad47ad8d6076416b (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/llcommon/llformat.h')
-rw-r--r--indra/llcommon/llformat.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llformat.h b/indra/llcommon/llformat.h
index dc64edb26d..17d8b4a8ad 100644
--- a/indra/llcommon/llformat.h
+++ b/indra/llcommon/llformat.h
@@ -42,4 +42,8 @@
std::string LL_COMMON_API llformat(const char *fmt, ...);
+// the same version as above but ensures that returned string is in utf8 on windows
+// to enable correct converting utf8_to_wstring.
+std::string LL_COMMON_API llformat_to_utf8(const char *fmt, ...);
+
#endif // LL_LLFORMAT_H