Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS

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