diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-27 17:51:37 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-27 17:51:37 +0100 |
| commit | ec935189b62b77e5e544b575531d69b6916f4cc5 (patch) | |
| tree | a31e18cf83dcbc6c79ae7b1049cfa04a7270ab6c /indra/llwindow | |
| parent | c05cfcae3f8b2f3b8aca7584b2872ee11aeea921 (diff) | |
| parent | 42aa72cd99b68698861c8bcbb555d2c2cf136f9d (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index e2da3d1ad8..a96ad7e796 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2877,8 +2877,13 @@ void LLSplashScreenWin32::updateImpl(const std::string& mesg) { if (!mWindow) return; + int output_str_len = MultiByteToWideChar(CP_UTF8, 0, mesg.c_str(), mesg.length(), NULL, 0); + if( output_str_len>1024 ) + return; + WCHAR w_mesg[1024]; - mbstowcs(w_mesg, mesg.c_str(), 1024); + + MultiByteToWideChar (CP_UTF8, 0, mesg.c_str(), mesg.length(), w_mesg, output_str_len); SendDlgItemMessage(mWindow, 666, // HACK: text id |