Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 47 insertions, 47 deletions

diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h
index b1089a3903..0cc699f59c 100644
--- a/indra/llui/lluistring.h
+++ b/indra/llui/lluistring.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lluistring.h
  * @author: Steve Bennetts
  * @brief A fancy wrapper for std::string supporting argument substitutions.
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2006&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -56,61 +56,61 @@
 class LLUIString
 {
 public:
-	// These methods all perform appropriate argument substitution
-	// and modify mOrig where appropriate
-	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; }
+    // These methods all perform appropriate argument substitution
+    // and modify mOrig where appropriate
+    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);
-	LLUIString& operator=(const std::string& s) { assign(s); return *this; }
+    void assign(const std::string& instring);
+    LLUIString& operator=(const std::string& s) { assign(s); return *this; }
 
-	void setArgList(const LLStringUtil::format_map_t& args);
-	void setArgs(const LLStringUtil::format_map_t& args) { setArgList(args); }
-	void setArgs(const class LLSD& sd);
-	void setArg(const std::string& key, const std::string& replacement);
+    void setArgList(const LLStringUtil::format_map_t& args);
+    void setArgs(const LLStringUtil::format_map_t& args) { setArgList(args); }
+    void setArgs(const class LLSD& sd);
+    void setArg(const std::string& key, const std::string& replacement);
 
-	const std::string& getString() const { return getUpdatedResult(); }
-	operator std::string() const { return getUpdatedResult(); }
+    const std::string& getString() const { return getUpdatedResult(); }
+    operator std::string() const { return getUpdatedResult(); }
 
-	const LLWString& getWString() const { return getUpdatedWResult(); }
-	operator LLWString() const { return getUpdatedWResult(); }
+    const LLWString& getWString() const { return getUpdatedWResult(); }
+    operator LLWString() const { return getUpdatedWResult(); }
 
-	bool empty() const { return getUpdatedResult().empty(); }
-	S32 length() const { return getUpdatedWResult().size(); }
+    bool empty() const { return getUpdatedResult().empty(); }
+    S32 length() const { return getUpdatedWResult().size(); }
 
-	void clear();
-	void clearArgs() { if (mArgs) mArgs->clear(); }
+    void clear();
+    void clearArgs() { if (mArgs) mArgs->clear(); }
 
-	// These utility functions are included for text editing.
-	// They do not affect mOrig and do not perform argument substitution
-	void truncate(S32 maxchars);
-	void erase(S32 charidx, S32 len);
-	void insert(S32 charidx, const LLWString& wchars);
-	void replace(S32 charidx, llwchar wc);
+    // These utility functions are included for text editing.
+    // They do not affect mOrig and do not perform argument substitution
+    void truncate(S32 maxchars);
+    void erase(S32 charidx, S32 len);
+    void insert(S32 charidx, const LLWString& wchars);
+    void replace(S32 charidx, llwchar wc);
 
 private:
-	// something changed, requiring reformatting of strings
-	void dirty();
+    // something changed, requiring reformatting of strings
+    void dirty();
 
-	std::string& getUpdatedResult() const { if (mNeedsResult) { updateResult(); } return mResult; }
-	LLWString& getUpdatedWResult() const{ if (mNeedsWResult) { updateWResult(); } return mWResult; }
+    std::string& getUpdatedResult() const { if (mNeedsResult) { updateResult(); } return mResult; }
+    LLWString& getUpdatedWResult() const{ if (mNeedsWResult) { updateWResult(); } return mWResult; }
 
-	// do actual work of updating strings (non-inlined)
-	void updateResult() const;
-	void updateWResult() const;
-	LLStringUtil::format_map_t& getArgs();
+    // do actual work of updating strings (non-inlined)
+    void updateResult() const;
+    void updateWResult() const;
+    LLStringUtil::format_map_t& getArgs();
 
-	std::string mOrig;
-	mutable std::string mResult;
-	mutable LLWString mWResult; // for displaying
-	LLStringUtil::format_map_t* mArgs;
+    std::string mOrig;
+    mutable std::string mResult;
+    mutable LLWString mWResult; // for displaying
+    LLStringUtil::format_map_t* mArgs;
 
-	// controls lazy evaluation
-	mutable bool	mNeedsResult;
-	mutable bool	mNeedsWResult;
+    // controls lazy evaluation
+    mutable bool    mNeedsResult;
+    mutable bool    mNeedsWResult;
 };
 
 #endif // LL_LLUISTRING_H