Merge main into inventory_favorites

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

1 files changed, 16 insertions, 16 deletions

diff --git a/indra/newview/llhudmanager.h b/indra/newview/llhudmanager.h
index 7782739690..27e5bafe61 100644
--- a/indra/newview/llhudmanager.h
+++ b/indra/newview/llhudmanager.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llhudmanager.h
  * @brief LLHUDManager class definition
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -36,25 +36,25 @@ class LLMessageSystem;
 
 class LLHUDManager : public LLSingleton<LLHUDManager>
 {
-	LLSINGLETON(LLHUDManager);
-	~LLHUDManager();
+    LLSINGLETON(LLHUDManager);
+    ~LLHUDManager();
 
 public:
-	LLHUDEffect *createViewerEffect(const U8 type, BOOL send_to_sim = TRUE, BOOL originated_here = TRUE);
+    LLHUDEffect *createViewerEffect(const U8 type, BOOL send_to_sim = TRUE, BOOL originated_here = TRUE);
 
-	void updateEffects();
-	void sendEffects();
-	void cleanupEffects();
+    void updateEffects();
+    void sendEffects();
+    void cleanupEffects();
 
-	static void shutdownClass();
+    static void shutdownClass();
 
-	static void processViewerEffect(LLMessageSystem *mesgsys, void **user_data);
+    static void processViewerEffect(LLMessageSystem *mesgsys, void **user_data);
 
-	static LLColor4 sParentColor;
-	static LLColor4 sChildColor;
+    static LLColor4 sParentColor;
+    static LLColor4 sChildColor;
 
 protected:
-	std::vector<LLPointer<LLHUDEffect> > mHUDEffects;
+    std::vector<LLPointer<LLHUDEffect> > mHUDEffects;
 };
 
 #endif // LL_LLHUDMANAGER_H