Merge main into inventory_favorites

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

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/llui/llspellcheckmenuhandler.h b/indra/llui/llspellcheckmenuhandler.h
index d5c95bad39..e1fec5cbea 100644
--- a/indra/llui/llspellcheckmenuhandler.h
+++ b/indra/llui/llspellcheckmenuhandler.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llspellcheckmenuhandler.h
  * @brief Interface used by spell check menu handling
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -30,17 +30,17 @@
 class LLSpellCheckMenuHandler
 {
 public:
-	virtual bool	getSpellCheck() const			{ return false; }
+    virtual bool    getSpellCheck() const           { return false; }
 
-	virtual const std::string& getSuggestion(U32 index) const	{ return LLStringUtil::null; }
-	virtual U32		getSuggestionCount() const		{ return 0; }
-	virtual void	replaceWithSuggestion(U32 index){}
+    virtual const std::string& getSuggestion(U32 index) const   { return LLStringUtil::null; }
+    virtual U32     getSuggestionCount() const      { return 0; }
+    virtual void    replaceWithSuggestion(U32 index){}
 
-	virtual void	addToDictionary()				{}
-	virtual bool	canAddToDictionary() const		{ return false; }
+    virtual void    addToDictionary()               {}
+    virtual bool    canAddToDictionary() const      { return false; }
 
-	virtual void	addToIgnore()					{}
-	virtual bool	canAddToIgnore() const			{ return false; }
+    virtual void    addToIgnore()                   {}
+    virtual bool    canAddToIgnore() const          { return false; }
 };
 
 #endif // LLSPELLCHECKMENUHANDLER_H