Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 126 insertions, 126 deletions

diff --git a/indra/llui/llstatgraph.cpp b/indra/llui/llstatgraph.cpp
index ec014a7419..58532fb22d 100644
--- a/indra/llui/llstatgraph.cpp
+++ b/indra/llui/llstatgraph.cpp
@@ -1,126 +1,126 @@
-/** 
- * @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$
- */
-
-//#include "llviewerprecompiledheaders.h"
-#include "linden_common.h"
-
-#include "llstatgraph.h"
-#include "llrender.h"
-
-#include "llmath.h"
-#include "llui.h"
-#include "llgl.h"
-#include "llglheaders.h"
-#include "lltracerecording.h"
-#include "lltracethreadrecorder.h"
-//#include "llviewercontrol.h"
-
-///////////////////////////////////////////////////////////////////////////////////
-
-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)
-{
-	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));
-	}
-}
-
-void LLStatGraph::draw()
-{
-	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);
-		}
-	}
-
-	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);
-
-		mUpdateTimer.reset();
-	}
-
-	LLColor4 color;
-
-	threshold_vec_t::iterator it = std::lower_bound(mThresholds.begin(), mThresholds.end(), Threshold(mValue / mMax, LLUIColor()));
-
-	if (it != mThresholds.begin())
-	{
-		it--;
-	}
-
-	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);
-	
-	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;
-}
-
-void LLStatGraph::setMax(const F32 max)
-{
-	mMax = max;
-}
-
+/**

+ * @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$

+ */

+

+//#include "llviewerprecompiledheaders.h"

+#include "linden_common.h"

+

+#include "llstatgraph.h"

+#include "llrender.h"

+

+#include "llmath.h"

+#include "llui.h"

+#include "llgl.h"

+#include "llglheaders.h"

+#include "lltracerecording.h"

+#include "lltracethreadrecorder.h"

+//#include "llviewercontrol.h"

+

+///////////////////////////////////////////////////////////////////////////////////

+

+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)

+{

+    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));

+    }

+}

+

+void LLStatGraph::draw()

+{

+    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);

+        }

+    }

+

+    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);

+

+        mUpdateTimer.reset();

+    }

+

+    LLColor4 color;

+

+    threshold_vec_t::iterator it = std::lower_bound(mThresholds.begin(), mThresholds.end(), Threshold(mValue / mMax, LLUIColor()));

+

+    if (it != mThresholds.begin())

+    {

+        it--;

+    }

+

+    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);

+

+    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;

+}

+

+void LLStatGraph::setMax(const F32 max)

+{

+    mMax = max;

+}

+