Merge main into inventory_favorites

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

1 files changed, 18 insertions, 18 deletions

diff --git a/indra/llmath/llbboxlocal.cpp b/indra/llmath/llbboxlocal.cpp
index bf0c1a7b93..cbb7a1b481 100644
--- a/indra/llmath/llbboxlocal.cpp
+++ b/indra/llmath/llbboxlocal.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llbboxlocal.cpp
  * @brief General purpose bounding box class (Not axis aligned).
  *
  * $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$
  */
@@ -31,25 +31,25 @@
 
 void LLBBoxLocal::addPoint(const LLVector3& p)
 {
-	mMin.mV[VX] = llmin( p.mV[VX], mMin.mV[VX] );
-	mMin.mV[VY] = llmin( p.mV[VY], mMin.mV[VY] );
-	mMin.mV[VZ] = llmin( p.mV[VZ], mMin.mV[VZ] );
-	mMax.mV[VX] = llmax( p.mV[VX], mMax.mV[VX] );
-	mMax.mV[VY] = llmax( p.mV[VY], mMax.mV[VY] );
-	mMax.mV[VZ] = llmax( p.mV[VZ], mMax.mV[VZ] );
+    mMin.mV[VX] = llmin( p.mV[VX], mMin.mV[VX] );
+    mMin.mV[VY] = llmin( p.mV[VY], mMin.mV[VY] );
+    mMin.mV[VZ] = llmin( p.mV[VZ], mMin.mV[VZ] );
+    mMax.mV[VX] = llmax( p.mV[VX], mMax.mV[VX] );
+    mMax.mV[VY] = llmax( p.mV[VY], mMax.mV[VY] );
+    mMax.mV[VZ] = llmax( p.mV[VZ], mMax.mV[VZ] );
 }
 
 void LLBBoxLocal::expand( F32 delta )
 {
-	mMin.mV[VX] -= delta;
-	mMin.mV[VY] -= delta;
-	mMin.mV[VZ] -= delta;
-	mMax.mV[VX] += delta;
-	mMax.mV[VY] += delta;
-	mMax.mV[VZ] += delta;
+    mMin.mV[VX] -= delta;
+    mMin.mV[VY] -= delta;
+    mMin.mV[VZ] -= delta;
+    mMax.mV[VX] += delta;
+    mMax.mV[VY] += delta;
+    mMax.mV[VZ] += delta;
 }
 
 LLBBoxLocal operator*(const LLBBoxLocal &a, const LLMatrix4 &b)
 {
-	return LLBBoxLocal( a.mMin * b, a.mMax * b );
+    return LLBBoxLocal( a.mMin * b, a.mMax * b );
 }