Merge main into inventory_favorites

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

1 files changed, 49 insertions, 49 deletions

diff --git a/indra/llui/lllocalcliprect.cpp b/indra/llui/lllocalcliprect.cpp
index f3a526faeb..f8ccb807e6 100644
--- a/indra/llui/lllocalcliprect.cpp
+++ b/indra/llui/lllocalcliprect.cpp
@@ -1,24 +1,24 @@
-/** 
+/**
 * @file lllocalcliprect.cpp
 *
 * $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$
 */
@@ -33,77 +33,77 @@
 
 
 LLScreenClipRect::LLScreenClipRect(const LLRect& rect, BOOL enabled)
-:	mScissorState(GL_SCISSOR_TEST),
-	mEnabled(enabled)
+:   mScissorState(GL_SCISSOR_TEST),
+    mEnabled(enabled)
 {
-	if (mEnabled)
-	{
-		pushClipRect(rect);
-		mScissorState.setEnabled(!sClipRectStack.empty());
-		updateScissorRegion();
-	}
+    if (mEnabled)
+    {
+        pushClipRect(rect);
+        mScissorState.setEnabled(!sClipRectStack.empty());
+        updateScissorRegion();
+    }
 }
 
 LLScreenClipRect::~LLScreenClipRect()
 {
-	if (mEnabled)
-	{
-		popClipRect();
-		updateScissorRegion();
-	}
+    if (mEnabled)
+    {
+        popClipRect();
+        updateScissorRegion();
+    }
 }
 
-//static 
+//static
 void LLScreenClipRect::pushClipRect(const LLRect& rect)
 {
-	LLRect combined_clip_rect = rect;
-	if (!sClipRectStack.empty())
-	{
-		LLRect top = sClipRectStack.top();
-		combined_clip_rect.intersectWith(top);
+    LLRect combined_clip_rect = rect;
+    if (!sClipRectStack.empty())
+    {
+        LLRect top = sClipRectStack.top();
+        combined_clip_rect.intersectWith(top);
 
-		if(combined_clip_rect.isEmpty())
-		{
-			// avoid artifacts where zero area rects show up as lines
-			combined_clip_rect = LLRect::null;
-		}
-	}
-	sClipRectStack.push(combined_clip_rect);
+        if(combined_clip_rect.isEmpty())
+        {
+            // avoid artifacts where zero area rects show up as lines
+            combined_clip_rect = LLRect::null;
+        }
+    }
+    sClipRectStack.push(combined_clip_rect);
 }
 
-//static 
+//static
 void LLScreenClipRect::popClipRect()
 {
-	sClipRectStack.pop();
+    sClipRectStack.pop();
 }
 
 //static
 void LLScreenClipRect::updateScissorRegion()
 {
-	if (sClipRectStack.empty()) return;
+    if (sClipRectStack.empty()) return;
 
-	// finish any deferred calls in the old clipping region
-	gGL.flush();
+    // finish any deferred calls in the old clipping region
+    gGL.flush();
 
-	LLRect rect = sClipRectStack.top();
-	stop_glerror();
-	S32 x,y,w,h;
-	x = llfloor(rect.mLeft * LLUI::getScaleFactor().mV[VX]);
-	y = llfloor(rect.mBottom * LLUI::getScaleFactor().mV[VY]);
-	w = llmax(0, llceil(rect.getWidth() * LLUI::getScaleFactor().mV[VX])) + 1;
-	h = llmax(0, llceil(rect.getHeight() * LLUI::getScaleFactor().mV[VY])) + 1;
-	glScissor( x,y,w,h );
-	stop_glerror();
+    LLRect rect = sClipRectStack.top();
+    stop_glerror();
+    S32 x,y,w,h;
+    x = llfloor(rect.mLeft * LLUI::getScaleFactor().mV[VX]);
+    y = llfloor(rect.mBottom * LLUI::getScaleFactor().mV[VY]);
+    w = llmax(0, llceil(rect.getWidth() * LLUI::getScaleFactor().mV[VX])) + 1;
+    h = llmax(0, llceil(rect.getHeight() * LLUI::getScaleFactor().mV[VY])) + 1;
+    glScissor( x,y,w,h );
+    stop_glerror();
 }
 
 //---------------------------------------------------------------------------
 // LLLocalClipRect
 //---------------------------------------------------------------------------
 LLLocalClipRect::LLLocalClipRect(const LLRect& rect, BOOL enabled /* = TRUE */)
-:	LLScreenClipRect(LLRect(rect.mLeft + LLFontGL::sCurOrigin.mX, 
-					rect.mTop + LLFontGL::sCurOrigin.mY, 
-					rect.mRight + LLFontGL::sCurOrigin.mX, 
-					rect.mBottom + LLFontGL::sCurOrigin.mY), enabled)
+:   LLScreenClipRect(LLRect(rect.mLeft + LLFontGL::sCurOrigin.mX,
+                    rect.mTop + LLFontGL::sCurOrigin.mY,
+                    rect.mRight + LLFontGL::sCurOrigin.mX,
+                    rect.mBottom + LLFontGL::sCurOrigin.mY), enabled)
 {}
 
 LLLocalClipRect::~LLLocalClipRect()