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, 141 insertions, 141 deletions

diff --git a/indra/llui/llstatgraph.h b/indra/llui/llstatgraph.h
index e70c745b3b..1c1b707688 100644
--- a/indra/llui/llstatgraph.h
+++ b/indra/llui/llstatgraph.h
@@ -1,141 +1,141 @@
-/** 
- * @file llstatgraph.h
- * @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$
- */
-
-#ifndef LL_LLSTATGRAPH_H
-#define LL_LLSTATGRAPH_H
-
-#include "llview.h"
-#include "llframetimer.h"
-#include "v4color.h"
-#include "lltrace.h"
-
-class LLStatGraph : public LLView
-{
-public:
-	struct ThresholdParams : public LLInitParam::Block<ThresholdParams>
-	{
-		Mandatory<F32>	value;
-		Optional<LLUIColor>	color;
-
-		ThresholdParams()
-		:	value("value"),
-			color("color", LLColor4::white)
-		{}
-	};
-
-	struct Thresholds : public LLInitParam::Block<Thresholds>
-	{
-		Multiple<ThresholdParams> threshold;
-
-		Thresholds()
-		:	threshold("threshold")
-		{}
-	};
-
-	struct StatParams : public LLInitParam::ChoiceBlock<StatParams>
-	{
-		Alternative<LLTrace::StatType<LLTrace::CountAccumulator>* >	count_stat_float;
-		Alternative<LLTrace::StatType<LLTrace::EventAccumulator>* >	event_stat_float;
-		Alternative<LLTrace::StatType<LLTrace::SampleAccumulator>* >	sample_stat_float;
-	};
-
-	struct Params : public LLInitParam::Block<Params, LLView::Params>
-	{
-		Mandatory<StatParams>	stat;
-		Optional<std::string>	label,
-								units;
-		Optional<S32>			precision;
-		Optional<F32>			min,
-								max;
-		Optional<bool>			per_sec;
-		Optional<F32>			value;
-
-		Optional<Thresholds>	thresholds;
-
-		Params()
-		:	stat("stat"),
-			label("label"),
-			units("units"),
-			precision("precision", 0),
-			min("min", 0.f),
-			max("max", 125.f),
-			per_sec("per_sec", true),
-			value("value", 0.f),
-			thresholds("thresholds")
-		{
-			Thresholds _thresholds;
-			_thresholds.threshold.add(ThresholdParams().value(0.f).color(LLColor4::green))
-								.add(ThresholdParams().value(0.33f).color(LLColor4::yellow))
-								.add(ThresholdParams().value(0.5f).color(LLColor4::red))
-								.add(ThresholdParams().value(0.75f).color(LLColor4::red));
-			thresholds = _thresholds;
-		}
-	};
-	LLStatGraph(const Params&);
-
-	void setMin(const F32 min);
-	void setMax(const F32 max);
-
-	virtual void draw();
-
-	/*virtual*/ void setValue(const LLSD& value);
-	
-private:
-	LLTrace::StatType<LLTrace::CountAccumulator>*	mNewStatFloatp;
-
-	bool mPerSec;
-
-	F32 mValue;
-
-	F32 mMin;
-	F32 mMax;
-	LLFrameTimer mUpdateTimer;
-	std::string mLabel;
-	std::string mUnits;
-	S32 mPrecision; // Num of digits of precision after dot
-
-	struct Threshold
-	{
-		Threshold(F32 value, const LLUIColor& color)
-		:	mValue(value),
-			mColor(color)
-		{}
-
-		F32 mValue;
-		LLUIColor mColor;
-		bool operator <(const Threshold& other) const
-		{
-			return mValue < other.mValue;
-		}
-	};
-	typedef std::vector<Threshold> threshold_vec_t;
-	threshold_vec_t mThresholds;
-	//S32 mNumThresholds;
-	//F32 mThresholds[4];
-	//LLColor4 mThresholdColors[4];
-};
-
-#endif  // LL_LLSTATGRAPH_H
+/**

+ * @file llstatgraph.h

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

+ */

+

+#ifndef LL_LLSTATGRAPH_H

+#define LL_LLSTATGRAPH_H

+

+#include "llview.h"

+#include "llframetimer.h"

+#include "v4color.h"

+#include "lltrace.h"

+

+class LLStatGraph : public LLView

+{

+public:

+    struct ThresholdParams : public LLInitParam::Block<ThresholdParams>

+    {

+        Mandatory<F32>  value;

+        Optional<LLUIColor> color;

+

+        ThresholdParams()

+        :   value("value"),

+            color("color", LLColor4::white)

+        {}

+    };

+

+    struct Thresholds : public LLInitParam::Block<Thresholds>

+    {

+        Multiple<ThresholdParams> threshold;

+

+        Thresholds()

+        :   threshold("threshold")

+        {}

+    };

+

+    struct StatParams : public LLInitParam::ChoiceBlock<StatParams>

+    {

+        Alternative<LLTrace::StatType<LLTrace::CountAccumulator>* > count_stat_float;

+        Alternative<LLTrace::StatType<LLTrace::EventAccumulator>* > event_stat_float;

+        Alternative<LLTrace::StatType<LLTrace::SampleAccumulator>* >    sample_stat_float;

+    };

+

+    struct Params : public LLInitParam::Block<Params, LLView::Params>

+    {

+        Mandatory<StatParams>   stat;

+        Optional<std::string>   label,

+                                units;

+        Optional<S32>           precision;

+        Optional<F32>           min,

+                                max;

+        Optional<bool>          per_sec;

+        Optional<F32>           value;

+

+        Optional<Thresholds>    thresholds;

+

+        Params()

+        :   stat("stat"),

+            label("label"),

+            units("units"),

+            precision("precision", 0),

+            min("min", 0.f),

+            max("max", 125.f),

+            per_sec("per_sec", true),

+            value("value", 0.f),

+            thresholds("thresholds")

+        {

+            Thresholds _thresholds;

+            _thresholds.threshold.add(ThresholdParams().value(0.f).color(LLColor4::green))

+                                .add(ThresholdParams().value(0.33f).color(LLColor4::yellow))

+                                .add(ThresholdParams().value(0.5f).color(LLColor4::red))

+                                .add(ThresholdParams().value(0.75f).color(LLColor4::red));

+            thresholds = _thresholds;

+        }

+    };

+    LLStatGraph(const Params&);

+

+    void setMin(const F32 min);

+    void setMax(const F32 max);

+

+    virtual void draw();

+

+    /*virtual*/ void setValue(const LLSD& value);

+

+private:

+    LLTrace::StatType<LLTrace::CountAccumulator>*   mNewStatFloatp;

+

+    bool mPerSec;

+

+    F32 mValue;

+

+    F32 mMin;

+    F32 mMax;

+    LLFrameTimer mUpdateTimer;

+    std::string mLabel;

+    std::string mUnits;

+    S32 mPrecision; // Num of digits of precision after dot

+

+    struct Threshold

+    {

+        Threshold(F32 value, const LLUIColor& color)

+        :   mValue(value),

+            mColor(color)

+        {}

+

+        F32 mValue;

+        LLUIColor mColor;

+        bool operator <(const Threshold& other) const

+        {

+            return mValue < other.mValue;

+        }

+    };

+    typedef std::vector<Threshold> threshold_vec_t;

+    threshold_vec_t mThresholds;

+    //S32 mNumThresholds;

+    //F32 mThresholds[4];

+    //LLColor4 mThresholdColors[4];

+};

+

+#endif  // LL_LLSTATGRAPH_H