diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-04-07 16:31:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-04-07 16:31:32 -0700 |
| commit | c9a9ab1b6a23525229e39c42440e302feef0288e (patch) | |
| tree | 687e5690f9f6ea91577f0075aaffcddedbdd5022 /indra/llcommon/llstring.h | |
| parent | 78eada5b6c3a8d20a2ea49887ab7c091e4b6fa14 (diff) | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rwxr-xr-x | indra/llcommon/llstring.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index f9702868c8..16a19e7021 100755 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -518,10 +518,13 @@ LL_COMMON_API S32 wchar_to_utf8chars(llwchar inchar, char* outchars); LL_COMMON_API std::string wstring_to_utf8str(const LLWString &utf32str, S32 len); LL_COMMON_API std::string wstring_to_utf8str(const LLWString &utf32str); - LL_COMMON_API std::string utf16str_to_utf8str(const llutf16string &utf16str, S32 len); LL_COMMON_API std::string utf16str_to_utf8str(const llutf16string &utf16str); +#if LL_WINDOWS +inline std::string wstring_to_utf8str(const llutf16string &utf16str) { return utf16str_to_utf8str(utf16str);} +#endif + // Length of this UTF32 string in bytes when transformed to UTF8 LL_COMMON_API S32 wstring_utf8_length(const LLWString& wstr); |