Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 1 insertions, 1 deletions

diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index f16c38a11a..925608e47e 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -210,7 +210,7 @@ void LLEmojiDictionary::findByShortCode(
                 std::size_t begin, end;
                 if (searchInShortCode(begin, end, shortCode, needle))
                 {
-                    results[begin].emplace_back(d.Character, shortCode, begin, end);
+                    results[static_cast<llwchar>(begin)].emplace_back(d.Character, shortCode, begin, end);
                 }
             }
         }