Merge main into inventory_favorites

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

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/newview/llviewerlayer.h b/indra/newview/llviewerlayer.h
index f9ec9c0c83..53a28a38f8 100644
--- a/indra/newview/llviewerlayer.h
+++ b/indra/newview/llviewerlayer.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llviewerlayer.h
  * @brief LLViewerLayer class header file
  *
  * $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,17 +32,17 @@
 class LLViewerLayer
 {
 public:
-	LLViewerLayer(const S32 width, const F32 scale = 1.f);
-	virtual ~LLViewerLayer();
+    LLViewerLayer(const S32 width, const F32 scale = 1.f);
+    virtual ~LLViewerLayer();
 
-	F32 getValueScaled(const F32 x, const F32 y) const;
+    F32 getValueScaled(const F32 x, const F32 y) const;
 protected:
-	F32 getValue(const S32 x, const S32 y) const;
+    F32 getValue(const S32 x, const S32 y) const;
 protected:
-	S32 mWidth;
-	F32 mScale;
-	F32 mScaleInv;
-	F32 *mDatap;
+    S32 mWidth;
+    F32 mScale;
+    F32 mScaleInv;
+    F32 *mDatap;
 };
 
 #endif // LL_LLVIEWERLAYER_H