diff options
author | Brad Linden <brad@lindenlab.com> | 2024-06-04 10:36:52 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-06-04 10:36:52 -0700 |
commit | fdbf73d95392e2dc64e3193a9cc3ea4c8260b8dc (patch) | |
tree | 445d8bd89ab9541db02d04e253869a96cdcd03d6 /indra/newview/llfloaterimsessiontab.cpp | |
parent | 0f6ef1643e6149a40aa605ad8f44d89df843bd80 (diff) | |
parent | 08c483c2693153f49cfacb8cf517cf6067f53205 (diff) |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
Diffstat (limited to 'indra/newview/llfloaterimsessiontab.cpp')
-rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 81a4f9936c..a0b56b14f0 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -587,13 +587,13 @@ void LLFloaterIMSessionTab::appendMessage(const LLChat& chat, const LLSD& args) mChatHistory->appendMessage(chat, chat_args); } -void LLFloaterIMSessionTab::updateUsedEmojis(LLWString text) +void LLFloaterIMSessionTab::updateUsedEmojis(LLWStringView text) { LLEmojiDictionary* dictionary = LLEmojiDictionary::getInstance(); llassert_always(dictionary); bool emojiSent = false; - for (llwchar& c : text) + for (const llwchar& c : text) { if (dictionary->isEmoji(c)) { |