File tree Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -47,6 +47,12 @@ void LLUIString::assign(const std::string& s)
47
47
dirty ();
48
48
}
49
49
50
+ void LLUIString::assign (const LLWString& instring)
51
+ {
52
+ mOrig = wstring_to_utf8str (instring);
53
+ dirty ();
54
+ }
55
+
50
56
void LLUIString::setArgList (const LLStringUtil::format_map_t & args)
51
57
52
58
{
Original file line number Diff line number Diff line change @@ -61,10 +61,11 @@ class LLUIString
61
61
LLUIString () : mArgs (NULL ), mNeedsResult (false ), mNeedsWResult (false ) {}
62
62
LLUIString (const std::string& instring, const LLStringUtil::format_map_t & args);
63
63
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); }
65
65
~LLUIString () { delete mArgs ; }
66
66
67
67
void assign (const std::string& instring);
68
+ void assign (const LLWString& instring);
68
69
LLUIString& operator =(const std::string& s) { assign (s); return *this ; }
69
70
70
71
void setArgList (const LLStringUtil::format_map_t & args);
You can’t perform that action at this time.
0 commit comments