Merge main into inventory_favorites

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

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/linux_crash_logger/llcrashloggerlinux.h b/indra/linux_crash_logger/llcrashloggerlinux.h
index 789f6f03f5..dcecbe746d 100644
--- a/indra/linux_crash_logger/llcrashloggerlinux.h
+++ b/indra/linux_crash_logger/llcrashloggerlinux.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llcrashloggerlinux.h
  * @brief Linux crash logger definition
  *
  * $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$
  */
@@ -34,12 +34,12 @@
 class LLCrashLoggerLinux : public LLCrashLogger
 {
 public:
-	LLCrashLoggerLinux(void);
-	~LLCrashLoggerLinux(void);
-	virtual bool frame();
-	virtual void updateApplication(const std::string& = LLStringUtil::null);
-	virtual void gatherPlatformSpecificFiles();
-	virtual bool cleanup();
+    LLCrashLoggerLinux(void);
+    ~LLCrashLoggerLinux(void);
+    virtual bool frame();
+    virtual void updateApplication(const std::string& = LLStringUtil::null);
+    virtual void gatherPlatformSpecificFiles();
+    virtual bool cleanup();
 };
 
 #endif