Merge main into inventory_favorites

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

1 files changed, 30 insertions, 30 deletions

diff --git a/indra/llwindow/llmousehandler.h b/indra/llwindow/llmousehandler.h
index d221dd117c..dea28a0fc3 100644
--- a/indra/llwindow/llmousehandler.h
+++ b/indra/llwindow/llmousehandler.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llmousehandler.h
  * @brief LLMouseHandler class definition
  *
  * $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$
  */
@@ -32,42 +32,42 @@
 #include "indra_constants.h"
 
 // Mostly-abstract interface.
-// Intended for use via multiple inheritance. 
+// Intended for use via multiple inheritance.
 // A class may have as many interfaces as it likes, but never needs to inherit one more than once.
 
 class LLMouseHandler
 {
 public:
-	LLMouseHandler() {}
-	virtual ~LLMouseHandler() {}
+    LLMouseHandler() {}
+    virtual ~LLMouseHandler() {}
 
-	typedef enum {
-		SHOW_NEVER,
-		SHOW_IF_NOT_BLOCKED,
-		SHOW_ALWAYS,
-	} EShowToolTip;
+    typedef enum {
+        SHOW_NEVER,
+        SHOW_IF_NOT_BLOCKED,
+        SHOW_ALWAYS,
+    } EShowToolTip;
 
-	virtual BOOL	handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) = 0;
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) = 0;
-	virtual BOOL	handleMiddleMouseDown(S32 x, S32 y, MASK mask) = 0;
-	virtual BOOL	handleMiddleMouseUp(S32 x, S32 y, MASK mask) = 0;
-	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask) = 0;
-	virtual BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask) = 0;
-	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
+    virtual BOOL    handleAnyMouseClick(S32 x, S32 y, MASK mask, EMouseClickType clicktype, BOOL down);
+    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask) = 0;
+    virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask) = 0;
+    virtual BOOL    handleMiddleMouseDown(S32 x, S32 y, MASK mask) = 0;
+    virtual BOOL    handleMiddleMouseUp(S32 x, S32 y, MASK mask) = 0;
+    virtual BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask) = 0;
+    virtual BOOL    handleRightMouseUp(S32 x, S32 y, MASK mask) = 0;
+    virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
 
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) = 0;
-	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
-	virtual BOOL	handleScrollHWheel(S32 x, S32 y, S32 clicks) = 0;
-	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask) = 0;
-	virtual const std::string& getName() const = 0;
+    virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
+    virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
+    virtual BOOL    handleScrollHWheel(S32 x, S32 y, S32 clicks) = 0;
+    virtual BOOL    handleToolTip(S32 x, S32 y, MASK mask) = 0;
+    virtual const std::string& getName() const = 0;
 
-	virtual void	onMouseCaptureLost() = 0;
+    virtual void    onMouseCaptureLost() = 0;
 
-	virtual void	screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const = 0;
-	virtual void	localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const = 0;
+    virtual void    screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const = 0;
+    virtual void    localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const = 0;
 
-	virtual BOOL hasMouseCapture() = 0;
+    virtual BOOL hasMouseCapture() = 0;
 };
 
 #endif