Merge main into inventory_favorites

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

1 files changed, 63 insertions, 63 deletions

diff --git a/indra/llui/llstatgraph.cpp b/indra/llui/llstatgraph.cpp
index 3fe314e77a..bf08055554 100644
--- a/indra/llui/llstatgraph.cpp
+++ b/indra/llui/llstatgraph.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llstatgraph.cpp
  * @brief Simpler compact stat graph with tooltip
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -41,86 +41,86 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 LLStatGraph::LLStatGraph(const Params& p)
-:	LLView(p),
-	mMin(p.min),
-	mMax(p.max),
-	mPerSec(p.per_sec),
-	mPrecision(p.precision),
-	mValue(p.value),
-	mUnits(p.units),
-	mNewStatFloatp(p.stat.count_stat_float)
+:   LLView(p),
+    mMin(p.min),
+    mMax(p.max),
+    mPerSec(p.per_sec),
+    mPrecision(p.precision),
+    mValue(p.value),
+    mUnits(p.units),
+    mNewStatFloatp(p.stat.count_stat_float)
 {
-	setToolTip(p.name());
+    setToolTip(p.name());
 
-	for(LLInitParam::ParamIterator<ThresholdParams>::const_iterator it = p.thresholds.threshold.begin(), end_it = p.thresholds.threshold.end();
-		it != end_it;
-		++it)
-	{
-		mThresholds.push_back(Threshold(it->value(), it->color));
-	}
+    for(LLInitParam::ParamIterator<ThresholdParams>::const_iterator it = p.thresholds.threshold.begin(), end_it = p.thresholds.threshold.end();
+        it != end_it;
+        ++it)
+    {
+        mThresholds.push_back(Threshold(it->value(), it->color));
+    }
 }
 
 void LLStatGraph::draw()
 {
-	F32 range, frac;
-	range = mMax - mMin;
-	if (mNewStatFloatp)
-	{
-		LLTrace::Recording& recording = LLTrace::get_frame_recording().getLastRecording();
+    F32 range, frac;
+    range = mMax - mMin;
+    if (mNewStatFloatp)
+    {
+        LLTrace::Recording& recording = LLTrace::get_frame_recording().getLastRecording();
+
+        if (mPerSec)
+        {
+            mValue = recording.getPerSec(*mNewStatFloatp);
+        }
+        else
+        {
+            mValue = recording.getSum(*mNewStatFloatp);
+        }
+    }
 
-		if (mPerSec)
-		{
-			mValue = recording.getPerSec(*mNewStatFloatp);
-		}
-		else
-		{
-			mValue = recording.getSum(*mNewStatFloatp);
-		}
-	}
+    frac = (mValue - mMin) / range;
+    frac = llmax(0.f, frac);
+    frac = llmin(1.f, frac);
 
-	frac = (mValue - mMin) / range;
-	frac = llmax(0.f, frac);
-	frac = llmin(1.f, frac);
+    if (mUpdateTimer.getElapsedTimeF32() > 0.5f)
+    {
+        std::string format_str;
+        std::string tmp_str;
+        format_str = llformat("%%s%%.%df%%s", mPrecision);
+        tmp_str = llformat(format_str.c_str(), mLabel.c_str(), mValue, mUnits.c_str());
+        setToolTip(tmp_str);
 
-	if (mUpdateTimer.getElapsedTimeF32() > 0.5f)
-	{
-		std::string format_str;
-		std::string tmp_str;
-		format_str = llformat("%%s%%.%df%%s", mPrecision);
-		tmp_str = llformat(format_str.c_str(), mLabel.c_str(), mValue, mUnits.c_str());
-		setToolTip(tmp_str);
+        mUpdateTimer.reset();
+    }
 
-		mUpdateTimer.reset();
-	}
+    LLColor4 color;
 
-	LLColor4 color;
+    threshold_vec_t::iterator it = std::lower_bound(mThresholds.begin(), mThresholds.end(), Threshold(mValue / mMax, LLUIColor()));
 
-	threshold_vec_t::iterator it = std::lower_bound(mThresholds.begin(), mThresholds.end(), Threshold(mValue / mMax, LLUIColor()));
+    if (it != mThresholds.begin())
+    {
+        it--;
+    }
 
-	if (it != mThresholds.begin())
-	{
-		it--;
-	}
+    color = LLUIColorTable::instance().getColor( "MenuDefaultBgColor" );
+    gGL.color4fv(color.mV);
+    gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, TRUE);
 
-	color = LLUIColorTable::instance().getColor( "MenuDefaultBgColor" );
-	gGL.color4fv(color.mV);
-	gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, TRUE);
+    gGL.color4fv(LLColor4::black.mV);
+    gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, FALSE);
 
-	gGL.color4fv(LLColor4::black.mV);
-	gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, FALSE);
-	
-	color = it->mColor;
-	gGL.color4fv(color.mV);
-	gl_rect_2d(1, ll_round(frac*getRect().getHeight()), getRect().getWidth() - 1, 0, TRUE);
+    color = it->mColor;
+    gGL.color4fv(color.mV);
+    gl_rect_2d(1, ll_round(frac*getRect().getHeight()), getRect().getWidth() - 1, 0, TRUE);
 }
 
 void LLStatGraph::setMin(const F32 min)
 {
-	mMin = min;
+    mMin = min;
 }
 
 void LLStatGraph::setMax(const F32 max)
 {
-	mMax = max;
+    mMax = max;
 }