diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-26 10:34:39 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-26 10:34:39 +0100 |
| commit | 7ac8658c774428aa531cf8d004463d5c0991ae62 (patch) | |
| tree | 96577339efce5ccb30dc3968ebb3ee2bd9ea4155 /indra/llcommon/llformat.h | |
| parent | 85b677823f1515f242e403a6c160af4a9f3ee595 (diff) | |
| parent | fe91462d6277251dbcc6053bc8ecd54dd93a13f0 (diff) | |
(hairy) merge from viewer-release
Diffstat (limited to 'indra/llcommon/llformat.h')
| -rw-r--r-- | indra/llcommon/llformat.h | 4 |
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 |