diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:28:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:28:15 +0200 |
| commit | 27e197459da275d2cd8847aa36e6c6bc4720e5c5 (patch) | |
| tree | fccc0ceaac90e03939d37e54cb8519a0132993cf /indra/llwindow/llwindowwin32.cpp | |
| parent | 1a1465dab94a2829cedb4ee4cd0c0169cea0fdeb (diff) | |
| parent | 2ab914a9cdd1ad809879aca05dbf4b624949ecea (diff) | |
Merge
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 4ee4a5357c..504c1589b0 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -3275,8 +3275,10 @@ S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 t break; } - // HACK! Doesn't properly handle wide strings! - int retval_win = MessageBoxA(NULL, text.c_str(), caption.c_str(), uType); + int retval_win = MessageBoxW(NULL, // HWND + ll_convert_string_to_wide(text).c_str(), + ll_convert_string_to_wide(caption).c_str(), + uType); S32 retval; switch(retval_win) |