diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-10 13:02:09 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-10 13:02:09 +0800 |
| commit | 91cc1af25286c9a1a55bd99949a4d02cb19c2a3e (patch) | |
| tree | 7439f3aee7dfa9c29e67264b2a7ab13789f1fa4d /indra/llui/lluistring.cpp | |
| parent | 70e36b3ff4673888a951f1f3487176ec3ca44fe5 (diff) | |
| parent | c162d8a060e9b48a7945eb0b1bdafbff959b7faf (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llui/lluistring.cpp')
| -rw-r--r-- | indra/llui/lluistring.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp index bfadeb8428..ab6de16639 100644 --- a/indra/llui/lluistring.cpp +++ b/indra/llui/lluistring.cpp @@ -47,6 +47,12 @@ void LLUIString::assign(const std::string& s) dirty(); } +void LLUIString::assign(const LLWString& instring) +{ + mOrig = wstring_to_utf8str(instring); + dirty(); +} + void LLUIString::setArgList(const LLStringUtil::format_map_t& args) { |