diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-12-09 20:18:37 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-12-09 23:06:21 +0200 |
| commit | c162d8a060e9b48a7945eb0b1bdafbff959b7faf (patch) | |
| tree | ad605795ded21d6ea81b054696c93dd200f54ac4 /indra/llui | |
| parent | 412b3db5a877eab977346e3f30464d5745afd69b (diff) | |
#3222 Emoji tabs losing symbols
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lluistring.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/lluistring.h | 3 |
2 files changed, 8 insertions, 1 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) { diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h index b9d4ff0ebb..2512634004 100644 --- a/indra/llui/lluistring.h +++ b/indra/llui/lluistring.h @@ -61,10 +61,11 @@ public: LLUIString() : mArgs(NULL), mNeedsResult(false), mNeedsWResult(false) {} LLUIString(const std::string& instring, const LLStringUtil::format_map_t& args); LLUIString(const std::string& instring) : mArgs(NULL) { assign(instring); } - LLUIString(const LLWString& instring) : mArgs(NULL) { insert(0, instring); } + LLUIString(const LLWString& instring) : mArgs(NULL) { assign(instring); } ~LLUIString() { delete mArgs; } void assign(const std::string& instring); + void assign(const LLWString& instring); LLUIString& operator=(const std::string& s) { assign(s); return *this; } void setArgList(const LLStringUtil::format_map_t& args); |