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/llinspect.h b/indra/newview/llinspect.h
index 6909aa3f16..881043389d 100644
--- a/indra/newview/llinspect.h
+++ b/indra/newview/llinspect.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llinspect.h
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -34,30 +34,30 @@
 class LLInspect : public LLFloater
 {
 public:
-	LLInspect(const LLSD& key);
-	virtual ~LLInspect();
-	
-	/// Inspectors have a custom fade-in/fade-out animation
-	/*virtual*/ void draw();
-	
-	/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
-	/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
-	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
-	
-	/// Start open animation
-	/*virtual*/ void onOpen(const LLSD& avatar_id);
-	
-	/// Inspectors close themselves when they lose focus
-	/*virtual*/ void onFocusLost();
+    LLInspect(const LLSD& key);
+    virtual ~LLInspect();
+
+    /// Inspectors have a custom fade-in/fade-out animation
+    /*virtual*/ void draw();
+
+    /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+    /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
+    /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
+
+    /// Start open animation
+    /*virtual*/ void onOpen(const LLSD& avatar_id);
+
+    /// Inspectors close themselves when they lose focus
+    /*virtual*/ void onFocusLost();
+
+    void repositionInspector(const LLSD& data);
 
-	void repositionInspector(const LLSD& data);
-	
 protected:
 
-	virtual bool childHasVisiblePopupMenu();
+    virtual bool childHasVisiblePopupMenu();
 
-	LLFrameTimer		mCloseTimer;
-	LLFrameTimer		mOpenTimer;
+    LLFrameTimer        mCloseTimer;
+    LLFrameTimer        mOpenTimer;
 };
 
 #endif