Skip to content

Commit c162d8a

Browse files
committed
#3222 Emoji tabs losing symbols
1 parent 412b3db commit c162d8a

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

indra/llui/lluistring.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ void LLUIString::assign(const std::string& s)
4747
dirty();
4848
}
4949

50+
void LLUIString::assign(const LLWString& instring)
51+
{
52+
mOrig = wstring_to_utf8str(instring);
53+
dirty();
54+
}
55+
5056
void LLUIString::setArgList(const LLStringUtil::format_map_t& args)
5157

5258
{

indra/llui/lluistring.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,11 @@ class LLUIString
6161
LLUIString() : mArgs(NULL), mNeedsResult(false), mNeedsWResult(false) {}
6262
LLUIString(const std::string& instring, const LLStringUtil::format_map_t& args);
6363
LLUIString(const std::string& instring) : mArgs(NULL) { assign(instring); }
64-
LLUIString(const LLWString& instring) : mArgs(NULL) { insert(0, instring); }
64+
LLUIString(const LLWString& instring) : mArgs(NULL) { assign(instring); }
6565
~LLUIString() { delete mArgs; }
6666

6767
void assign(const std::string& instring);
68+
void assign(const LLWString& instring);
6869
LLUIString& operator=(const std::string& s) { assign(s); return *this; }
6970

7071
void setArgList(const LLStringUtil::format_map_t& args);

0 commit comments

Comments
 (0)