diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-13 09:20:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-13 09:20:57 -0400 |
| commit | 7ced89435d702b8a6bc02908769bed47e20d6ec0 (patch) | |
| tree | bb4735ba807f4d4caf7cf6161462557cfc9864bd /indra/newview/llviewermedia.cpp | |
| parent | 3d191c09b1b1eb6726fe67f6fdf5445d83536578 (diff) | |
| parent | d6f3f20af6cccf53746cbf1fdf39bc4e235c4f0d (diff) | |
Merge pull request #2548 from secondlife/lua-frame-profile
Make Develop->Render Tests->Frame Profile dump JSON to a file too (#2412)
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 9739cac311..1c8f1a32b9 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2766,7 +2766,8 @@ bool LLViewerMediaImpl::handleUnicodeCharHere(llwchar uni_char) { LLSD native_key_data = gViewerWindow->getWindow()->getNativeKeyData(); - mMediaSource->textInput(wstring_to_utf8str(LLWString(1, uni_char)), gKeyboard->currentMask(false), native_key_data); + mMediaSource->textInput(ll_convert_to<std::string>(uni_char), + gKeyboard->currentMask(false), native_key_data); } } |