Merge main into inventory_favorites

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

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h
index ab52bf15f9..2242c95b06 100644
--- a/indra/newview/llappviewerwin32.h
+++ b/indra/newview/llappviewerwin32.h
@@ -5,24 +5,24 @@
  * $LicenseInfo:firstyear=2007&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$
- */ 
+ */
 
 #ifndef LL_LLAPPVIEWERWIN32_H
 #define LL_LLAPPVIEWERWIN32_H
@@ -34,37 +34,37 @@
 class LLAppViewerWin32 : public LLAppViewer
 {
 public:
-	LLAppViewerWin32(const char* cmd_line);
-	virtual ~LLAppViewerWin32();
+    LLAppViewerWin32(const char* cmd_line);
+    virtual ~LLAppViewerWin32();
 
-	//
-	// Main application logic
-	//
-	bool init() override; // Override to do application initialization
+    //
+    // Main application logic
+    //
+    bool init() override; // Override to do application initialization
     bool cleanup() override;
 
     void reportCrashToBugsplat(void* pExcepInfo) override;
 
 protected:
-	void initLoggingAndGetLastDuration() override; // Override to clean stack_trace info.
-	void initConsole() override; // Initialize OS level debugging console.
-	bool initHardwareTest() override; // Win32 uses DX9 to test hardware.
-	bool initParseCommandLine(LLCommandLineParser& clp) override;
+    void initLoggingAndGetLastDuration() override; // Override to clean stack_trace info.
+    void initConsole() override; // Initialize OS level debugging console.
+    bool initHardwareTest() override; // Win32 uses DX9 to test hardware.
+    bool initParseCommandLine(LLCommandLineParser& clp) override;
 
-	bool beingDebugged() override;
-	bool restoreErrorTrap() override;
+    bool beingDebugged() override;
+    bool restoreErrorTrap() override;
 
-	bool sendURLToOtherInstance(const std::string& url) override;
+    bool sendURLToOtherInstance(const std::string& url) override;
 
-	std::string generateSerialNumber();
+    std::string generateSerialNumber();
 
-	static const std::string sWindowClass;
+    static const std::string sWindowClass;
 
 private:
-	void disableWinErrorReporting();
+    void disableWinErrorReporting();
 
-	std::string mCmdLine;
-	bool mIsConsoleAllocated;
+    std::string mCmdLine;
+    bool mIsConsoleAllocated;
 };
 
 #endif // LL_LLAPPVIEWERWIN32_H