summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelemojicomplete.cpp
diff options
context:
space:
mode:
authornat-goodspeed <nat@lindenlab.com>2024-09-24 07:28:44 -0400
committerGitHub <noreply@github.com>2024-09-24 07:28:44 -0400
commit1175288a3c685310dbbf7fdd46d7deae0b0bf92d (patch)
tree84fd4d186169807c4da1c0c352d9be92f1e63227 /indra/newview/llpanelemojicomplete.cpp
parent0ee1106faccf90c883d8b9ffc522a341659742ed (diff)
parent9036e4582cec1893016bd692293ec1c0135f7112 (diff)
Merge pull request #2534 from secondlife/release/luau-scripting
Add Lua scripting to develop, behind feature flag
Diffstat (limited to 'indra/newview/llpanelemojicomplete.cpp')
-rw-r--r--indra/newview/llpanelemojicomplete.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelemojicomplete.cpp b/indra/newview/llpanelemojicomplete.cpp
index dd4203745e..0d6ca1cb94 100644
--- a/indra/newview/llpanelemojicomplete.cpp
+++ b/indra/newview/llpanelemojicomplete.cpp
@@ -283,8 +283,7 @@ void LLPanelEmojiComplete::onCommit()
{
if (mCurSelected < mTotalEmojis)
{
- LLSD value(wstring_to_utf8str(LLWString(1, mEmojis[mCurSelected].Character)));
- setValue(value);
+ setValue(ll_convert_to<std::string>(mEmojis[mCurSelected].Character));
LLUICtrl::onCommit();
}
}