summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2024-03-10 15:36:58 -0700
committerRoxie Linden <roxie@lindenlab.com>2024-03-10 15:36:58 -0700
commitd67a3022d3a9432f279768371b27ea5322315905 (patch)
tree0254d8a7889ff6639cf6bf9b40f63499df37ceb4 /indra/newview/llfloaterimsession.cpp
parentfc462b2b0f7ee153626d162bd97a05110f0804b7 (diff)
parentb242d696ba03f66494dfca1f05a74ed1b15cd6e4 (diff)
Merge branch 'main' of github.com:secondlife/viewer-private into roxie/webrtc-voice
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
-rw-r--r--indra/newview/llfloaterimsession.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
index 1b04db89c4..c6868ffeda 100644
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@@ -249,6 +249,8 @@ void LLFloaterIMSession::sendMsgFromInputEditor()
LLWStringUtil::replaceChar(text,182,'\n'); // Convert paragraph symbols back into newlines.
if(!text.empty())
{
+ updateUsedEmojis(text);
+
// Truncate and convert to UTF8 for transport
std::string utf8_text = wstring_to_utf8str(text);