Merge branch 'release/maint-b' into pipewire-linux-volume-catcher

1 files changed, 43 insertions, 43 deletions

diff --git a/indra/llui/llresizebar.h b/indra/llui/llresizebar.h
index 20a2406484..0fcecd1dbe 100644
--- a/indra/llui/llresizebar.h
+++ b/indra/llui/llresizebar.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llresizebar.h
  * @brief LLResizeBar base class
  *
  * $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,55 +32,55 @@
 class LLResizeBar : public LLView
 {
 public:
-	enum Side { LEFT, TOP, RIGHT, BOTTOM };
+    enum Side { LEFT, TOP, RIGHT, BOTTOM };
 
-	struct Params : public LLInitParam::Block<Params, LLView::Params>
-	{
-		Mandatory<LLView*> resizing_view;
-		Mandatory<Side>	side;
+    struct Params : public LLInitParam::Block<Params, LLView::Params>
+    {
+        Mandatory<LLView*> resizing_view;
+        Mandatory<Side> side;
 
-		Optional<S32>	min_size;
-		Optional<S32>	max_size;
-		Optional<bool>	snapping_enabled;
-		Optional<bool>	allow_double_click_snapping;
+        Optional<S32>   min_size;
+        Optional<S32>   max_size;
+        Optional<bool>  snapping_enabled;
+        Optional<bool>  allow_double_click_snapping;
 
-		Params();
-	};
+        Params();
+    };
 
 protected:
-	LLResizeBar(const LLResizeBar::Params& p);
-	friend class LLUICtrlFactory;
+    LLResizeBar(const LLResizeBar::Params& p);
+    friend class LLUICtrlFactory;
 
 public:
 
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask);
 
-	void			setResizeLimits( S32 min_size, S32 max_size ) { mMinSize = min_size; mMaxSize = max_size; }
-	void			setEnableSnapping(BOOL enable) { mSnappingEnabled = enable; }
-	void			setAllowDoubleClickSnapping(BOOL allow) { mAllowDoubleClickSnapping = allow; }
-	bool			canResize() { return getEnabled() && mMaxSize > mMinSize; }
-	void            setResizeListener(boost::function<void(void*)> listener) {mResizeListener = listener;}
-	void			setImagePanel(LLPanel * panelp);
-	LLPanel *		getImagePanel() const;
+    void            setResizeLimits( S32 min_size, S32 max_size ) { mMinSize = min_size; mMaxSize = max_size; }
+    void            setEnableSnapping(BOOL enable) { mSnappingEnabled = enable; }
+    void            setAllowDoubleClickSnapping(BOOL allow) { mAllowDoubleClickSnapping = allow; }
+    bool            canResize() { return getEnabled() && mMaxSize > mMinSize; }
+    void            setResizeListener(boost::function<void(void*)> listener) {mResizeListener = listener;}
+    void            setImagePanel(LLPanel * panelp);
+    LLPanel *       getImagePanel() const;
 
 private:
-	S32								mDragLastScreenX;
-	S32								mDragLastScreenY;
-	S32								mLastMouseScreenX;
-	S32								mLastMouseScreenY;
-	LLCoordGL						mLastMouseDir;
-	S32								mMinSize;
-	S32								mMaxSize;
-	const Side						mSide;
-	bool							mSnappingEnabled,
-									mAllowDoubleClickSnapping;
-	LLView*							mResizingView;
-	boost::function<void(void*)>	mResizeListener;
-	LLPointer<LLUIImage>			mDragHandleImage;
-	LLPanel *						mImagePanel;
+    S32                             mDragLastScreenX;
+    S32                             mDragLastScreenY;
+    S32                             mLastMouseScreenX;
+    S32                             mLastMouseScreenY;
+    LLCoordGL                       mLastMouseDir;
+    S32                             mMinSize;
+    S32                             mMaxSize;
+    const Side                      mSide;
+    bool                            mSnappingEnabled,
+                                    mAllowDoubleClickSnapping;
+    LLView*                         mResizingView;
+    boost::function<void(void*)>    mResizeListener;
+    LLPointer<LLUIImage>            mDragHandleImage;
+    LLPanel *                       mImagePanel;
 };
 
 #endif  // LL_RESIZEBAR_H