livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#3222 Emoji tabs losing symbols

master
Andrey Kleshchev 2024-12-09 20:18:37 +02:00 committed by Andrey Kleshchev
parent 412b3db5a8
commit c162d8a060
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/lluistring.cpp
View File

@ -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)
{

3
indra/llui/lluistring.h
View File

@ -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);