Merge main into inventory_favorites

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

1 files changed, 25 insertions, 25 deletions

diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h
index 929b1795aa..333424ba71 100644
--- a/indra/newview/llfloatermap.h
+++ b/indra/newview/llfloatermap.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloatermap.h
  * @brief The "mini-map" or radar in the upper right part of the screen.
  *
  * $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$
  */
@@ -38,30 +38,30 @@ class LLTextBox;
 class LLFloaterMap : public LLFloater
 {
 public:
-	LLFloaterMap(const LLSD& key);
-	static LLFloaterMap* getInstance();
-	virtual ~LLFloaterMap();
-	
-	/*virtual*/ BOOL 	postBuild();
-	/*virtual*/ BOOL	handleDoubleClick( S32 x, S32 y, MASK mask );
-	/*virtual*/ void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
-	/*virtual*/ void	draw();
+    LLFloaterMap(const LLSD& key);
+    static LLFloaterMap* getInstance();
+    virtual ~LLFloaterMap();
+
+    /*virtual*/ BOOL    postBuild();
+    /*virtual*/ BOOL    handleDoubleClick( S32 x, S32 y, MASK mask );
+    /*virtual*/ void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+    /*virtual*/ void    draw();
 
 private:
-	void setDirectionPos( LLTextBox* text_box, F32 rotation );
-	void updateMinorDirections();
+    void setDirectionPos( LLTextBox* text_box, F32 rotation );
+    void updateMinorDirections();
+
+    LLTextBox*      mTextBoxEast;
+    LLTextBox*      mTextBoxNorth;
+    LLTextBox*      mTextBoxWest;
+    LLTextBox*      mTextBoxSouth;
 
-	LLTextBox*		mTextBoxEast;
-	LLTextBox*		mTextBoxNorth;
-	LLTextBox*		mTextBoxWest;
-	LLTextBox*		mTextBoxSouth;
+    LLTextBox*      mTextBoxSouthEast;
+    LLTextBox*      mTextBoxNorthEast;
+    LLTextBox*      mTextBoxNorthWest;
+    LLTextBox*      mTextBoxSouthWest;
 
-	LLTextBox*		mTextBoxSouthEast;
-	LLTextBox*		mTextBoxNorthEast;
-	LLTextBox*		mTextBoxNorthWest;
-	LLTextBox*		mTextBoxSouthWest;
-	
-	LLNetMap*		mMap;
+    LLNetMap*       mMap;
 };
 
 #endif  // LL_LLFLOATERMAP_H