Merge main into inventory_favorites

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

1 files changed, 22 insertions, 22 deletions

diff --git a/indra/newview/llfloaternotificationsconsole.h b/indra/newview/llfloaternotificationsconsole.h
index 4e92b7d857..75161f8096 100644
--- a/indra/newview/llfloaternotificationsconsole.h
+++ b/indra/newview/llfloaternotificationsconsole.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloaternotificationsconsole.h
  * @brief Debugging console for unified notifications.
  *
  * $LicenseInfo:firstyear=2003&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$
  */
@@ -33,25 +33,25 @@
 
 class LLNotification;
 
-class LLFloaterNotificationConsole : 
-	public LLFloater
+class LLFloaterNotificationConsole :
+    public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 
 public:
 
-	// LLPanel
-	BOOL postBuild();
+    // LLPanel
+    BOOL postBuild();
 
-	void addChannel(const std::string& type, bool open = false);
-	void updateResizeLimits(LLLayoutStack &stack);
+    void addChannel(const std::string& type, bool open = false);
+    void updateResizeLimits(LLLayoutStack &stack);
 
-	void removeChannel(const std::string& type);
-	void updateResizeLimits();
+    void removeChannel(const std::string& type);
+    void updateResizeLimits();
 
 private:
-	LLFloaterNotificationConsole(const LLSD& key);	
-	void onClickAdd();
+    LLFloaterNotificationConsole(const LLSD& key);
+    void onClickAdd();
 };
 
 
@@ -61,15 +61,15 @@ private:
 class LLFloaterNotification : public LLFloater
 {
 public:
-	LLFloaterNotification(LLNotification* note);
+    LLFloaterNotification(LLNotification* note);
 
-	// LLPanel
-	BOOL postBuild();
-	void respond();
+    // LLPanel
+    BOOL postBuild();
+    void respond();
 
 private:
-	static void onCommitResponse(LLUICtrl* ctrl, void* data) { ((LLFloaterNotification*)data)->respond(); }
-	LLNotification* mNote;
+    static void onCommitResponse(LLUICtrl* ctrl, void* data) { ((LLFloaterNotification*)data)->respond(); }
+    LLNotification* mNote;
 };
 #endif