diff options
Diffstat (limited to 'indra/llui/lluistring.h')
-rw-r--r-- | indra/llui/lluistring.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h index b9d4ff0ebb..950d4e72c6 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); @@ -109,8 +110,8 @@ private: LLStringUtil::format_map_t* mArgs; // controls lazy evaluation - mutable bool mNeedsResult; - mutable bool mNeedsWResult; + mutable bool mNeedsResult { true }; + mutable bool mNeedsWResult { true }; }; #endif // LL_LLUISTRING_H |