diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-28 18:28:13 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-28 18:28:13 -0800 |
| commit | bf8dee73f90f74f3eb9fd544dc9673defa52817f (patch) | |
| tree | 3e8a711051c699fe96afcfead0e3fd4dc4f19db3 /indra/llwindow/llwindowwin32.cpp | |
| parent | c1d2416826406631807f153e7de9d2b790b0caa5 (diff) | |
| parent | e1a76999c3e8aad337d765fcd6eb50c8191409ea (diff) | |
Merge 6.1.1
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) |