diff options
author | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:12:00 -0800 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:12:00 -0800 |
commit | 258c039584dd293ba7218dc522882bc0bac25e63 (patch) | |
tree | a695d32a5fff74828d281f04186039e08287566a /indra/llui/lluistring.h | |
parent | 23d44cb6653ee4ca46ec0e33f19b393b58f5332f (diff) | |
parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) |
Merge remote-tracking branch 'origin/main' into release/gltf-maint2
Diffstat (limited to 'indra/llui/lluistring.h')
-rw-r--r-- | indra/llui/lluistring.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h index 07e02de6d8..b1089a3903 100644 --- a/indra/llui/lluistring.h +++ b/indra/llui/lluistring.h @@ -61,6 +61,7 @@ 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() { delete mArgs; } void assign(const std::string& instring); |