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

diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
index 35d1267a45..7c0cd99e43 100644
--- a/indra/newview/llfeaturemanager.h
+++ b/indra/newview/llfeaturemanager.h
@@ -1,188 +1,188 @@
-/** 
- * @file llfeaturemanager.h
- * @brief The feature manager is responsible for determining what features are turned on/off in the app.
- *
- * $LicenseInfo:firstyear=2003&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_LLFEATUREMANAGER_H
-#define LL_LLFEATUREMANAGER_H
-
-#include "stdtypes.h"
-
-#include "llsingleton.h"
-#include "llstring.h"
-#include <map>
-#include "llcoros.h"
-#include "lleventcoro.h"
-
-typedef enum EGPUClass
-{
-	GPU_CLASS_UNKNOWN = -1,
-	GPU_CLASS_0 = 0,
-	GPU_CLASS_1 = 1,
-	GPU_CLASS_2 = 2,
-	GPU_CLASS_3 = 3,
-	GPU_CLASS_4 = 4,
-	GPU_CLASS_5 = 5
-} EGPUClass; 
-
-
-class LLFeatureInfo
-{
-public:
-	LLFeatureInfo() : mValid(false), mAvailable(false), mRecommendedLevel(-1) {}
-	LLFeatureInfo(const std::string& name, const bool available, const F32 level);
-
-	bool isValid() const	{ return mValid; };
-
-public:
-	bool		mValid;
-	std::string	mName;
-	bool		mAvailable;
-	F32			mRecommendedLevel;
-};
-
-
-class LLFeatureList
-{
-public:
-	typedef std::map<std::string, LLFeatureInfo> feature_map_t;
-
-	LLFeatureList(const std::string& name);
-	virtual ~LLFeatureList();
-
-	bool isFeatureAvailable(const std::string& name);
-	F32 getRecommendedValue(const std::string& name);
-
-	void setFeatureAvailable(const std::string& name, const bool available);
-	void setRecommendedLevel(const std::string& name, const F32 level);
-
-	bool loadFeatureList(LLFILE *fp);
-
-	bool maskList(LLFeatureList &mask);
-
-	void addFeature(const std::string& name, const bool available, const F32 level);
-
-	feature_map_t& getFeatures()
-	{
-		return mFeatures;
-	}
-
-	void dump();
-protected:
-	std::string	mName;
-	feature_map_t	mFeatures;
-};
-
-
-class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManager>
-{
-	LLSINGLETON(LLFeatureManager);
-	~LLFeatureManager() {cleanupFeatureTables();}
-
-	// initialize this by loading feature table and gpu table
-	void initSingleton() override;
-
-public:
-
-	void maskCurrentList(const std::string& name); // Mask the current feature list with the named list
-
-	bool loadFeatureTables();
-
-	EGPUClass getGPUClass() 			{ return mGPUClass; }
-	std::string& getGPUString() 		{ return mGPUString; }
-    
-    // get the measured GPU memory bandwidth in GB/sec
-    // may return 0 of benchmark has not been run or failed to run
-    F32 getGPUMemoryBandwidth() { return mGPUMemoryBandwidth; }
-	bool isGPUSupported()				{ return mGPUSupported; }
-	F32 getExpectedGLVersion()			{ return mExpectedGLVersion; }
-	
-	void cleanupFeatureTables();
-
-	S32 getVersion() const				{ return mTableVersion; }
-	void setSafe(const bool safe)		{ mSafe = safe; }
-	bool isSafe() const					{ return mSafe; }
-
-	LLFeatureList *findMask(const std::string& name);
-	bool maskFeatures(const std::string& name);
-
-	// set the graphics to low, medium, high, or ultra.
-	// skipFeatures forces skipping of mostly hardware settings
-	// that we don't want to change when we change graphics
-	// settings
-	void setGraphicsLevel(U32 level, bool skipFeatures);
-
-	// What 'level' values are valid to pass to setGraphicsLevel()?
-	// 0 is the low end...
-	U32 getMaxGraphicsLevel() const;
-	bool isValidGraphicsLevel(U32 level) const;
-
-	// setGraphicsLevel() levels have names.
-	std::string getNameForGraphicsLevel(U32 level) const;
-	// returns -1 for unrecognized name (hence S32 rather than U32)
-	S32 getGraphicsLevelForName(const std::string& name) const;
-
-	void applyBaseMasks();
-	void applyRecommendedSettings();
-
-	// apply the basic masks.  Also, skip one saved
-	// in the skip list if true
-	void applyFeatures(bool skipFeatures);
-
-	LLSD getRecommendedSettingsMap();
-
-protected:
-	bool loadGPUClass();
-
-	bool parseFeatureTable(std::string filename);
-	///< @returns true is file parsed correctly, false if not
-
-	void initBaseMask();
-
-	std::map<std::string, LLFeatureList *> mMaskList;
-	std::set<std::string> mSkippedFeatures;
-	bool		mInited;
-	S32			mTableVersion;
-	bool		mSafe;					// Reinitialize everything to the "safe" mask
-	EGPUClass	mGPUClass;
-    F32         mGPUMemoryBandwidth = 0.f;  // measured memory bandwidth of GPU in GB/second
-	F32			mExpectedGLVersion;		//expected GL version according to gpu table
-	std::string	mGPUString;
-	bool		mGPUSupported;
-};
-
-inline
-LLFeatureManager::LLFeatureManager()
-:	LLFeatureList("default"),
-
-	mInited(false),
-	mTableVersion(0),
-	mSafe(false),
-	mGPUClass(GPU_CLASS_UNKNOWN),
-	mExpectedGLVersion(0.f),
-	mGPUSupported(false)
-{
-}
-
-#endif // LL_LLFEATUREMANAGER_H
+/**

+ * @file llfeaturemanager.h

+ * @brief The feature manager is responsible for determining what features are turned on/off in the app.

+ *

+ * $LicenseInfo:firstyear=2003&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_LLFEATUREMANAGER_H

+#define LL_LLFEATUREMANAGER_H

+

+#include "stdtypes.h"

+

+#include "llsingleton.h"

+#include "llstring.h"

+#include <map>

+#include "llcoros.h"

+#include "lleventcoro.h"

+

+typedef enum EGPUClass

+{

+    GPU_CLASS_UNKNOWN = -1,

+    GPU_CLASS_0 = 0,

+    GPU_CLASS_1 = 1,

+    GPU_CLASS_2 = 2,

+    GPU_CLASS_3 = 3,

+    GPU_CLASS_4 = 4,

+    GPU_CLASS_5 = 5

+} EGPUClass;

+

+

+class LLFeatureInfo

+{

+public:

+    LLFeatureInfo() : mValid(false), mAvailable(false), mRecommendedLevel(-1) {}

+    LLFeatureInfo(const std::string& name, const bool available, const F32 level);

+

+    bool isValid() const    { return mValid; };

+

+public:

+    bool        mValid;

+    std::string mName;

+    bool        mAvailable;

+    F32         mRecommendedLevel;

+};

+

+

+class LLFeatureList

+{

+public:

+    typedef std::map<std::string, LLFeatureInfo> feature_map_t;

+

+    LLFeatureList(const std::string& name);

+    virtual ~LLFeatureList();

+

+    bool isFeatureAvailable(const std::string& name);

+    F32 getRecommendedValue(const std::string& name);

+

+    void setFeatureAvailable(const std::string& name, const bool available);

+    void setRecommendedLevel(const std::string& name, const F32 level);

+

+    bool loadFeatureList(LLFILE *fp);

+

+    bool maskList(LLFeatureList &mask);

+

+    void addFeature(const std::string& name, const bool available, const F32 level);

+

+    feature_map_t& getFeatures()

+    {

+        return mFeatures;

+    }

+

+    void dump();

+protected:

+    std::string mName;

+    feature_map_t   mFeatures;

+};

+

+

+class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManager>

+{

+    LLSINGLETON(LLFeatureManager);

+    ~LLFeatureManager() {cleanupFeatureTables();}

+

+    // initialize this by loading feature table and gpu table

+    void initSingleton() override;

+

+public:

+

+    void maskCurrentList(const std::string& name); // Mask the current feature list with the named list

+

+    bool loadFeatureTables();

+

+    EGPUClass getGPUClass()             { return mGPUClass; }

+    std::string& getGPUString()         { return mGPUString; }

+

+    // get the measured GPU memory bandwidth in GB/sec

+    // may return 0 of benchmark has not been run or failed to run

+    F32 getGPUMemoryBandwidth() { return mGPUMemoryBandwidth; }

+    bool isGPUSupported()               { return mGPUSupported; }

+    F32 getExpectedGLVersion()          { return mExpectedGLVersion; }

+

+    void cleanupFeatureTables();

+

+    S32 getVersion() const              { return mTableVersion; }

+    void setSafe(const bool safe)       { mSafe = safe; }

+    bool isSafe() const                 { return mSafe; }

+

+    LLFeatureList *findMask(const std::string& name);

+    bool maskFeatures(const std::string& name);

+

+    // set the graphics to low, medium, high, or ultra.

+    // skipFeatures forces skipping of mostly hardware settings

+    // that we don't want to change when we change graphics

+    // settings

+    void setGraphicsLevel(U32 level, bool skipFeatures);

+

+    // What 'level' values are valid to pass to setGraphicsLevel()?

+    // 0 is the low end...

+    U32 getMaxGraphicsLevel() const;

+    bool isValidGraphicsLevel(U32 level) const;

+

+    // setGraphicsLevel() levels have names.

+    std::string getNameForGraphicsLevel(U32 level) const;

+    // returns -1 for unrecognized name (hence S32 rather than U32)

+    S32 getGraphicsLevelForName(const std::string& name) const;

+

+    void applyBaseMasks();

+    void applyRecommendedSettings();

+

+    // apply the basic masks.  Also, skip one saved

+    // in the skip list if true

+    void applyFeatures(bool skipFeatures);

+

+    LLSD getRecommendedSettingsMap();

+

+protected:

+    bool loadGPUClass();

+

+    bool parseFeatureTable(std::string filename);

+    ///< @returns true is file parsed correctly, false if not

+

+    void initBaseMask();

+

+    std::map<std::string, LLFeatureList *> mMaskList;

+    std::set<std::string> mSkippedFeatures;

+    bool        mInited;

+    S32         mTableVersion;

+    bool        mSafe;                  // Reinitialize everything to the "safe" mask

+    EGPUClass   mGPUClass;

+    F32         mGPUMemoryBandwidth = 0.f;  // measured memory bandwidth of GPU in GB/second

+    F32         mExpectedGLVersion;     //expected GL version according to gpu table

+    std::string mGPUString;

+    bool        mGPUSupported;

+};

+

+inline

+LLFeatureManager::LLFeatureManager()

+:   LLFeatureList("default"),

+

+    mInited(false),

+    mTableVersion(0),

+    mSafe(false),

+    mGPUClass(GPU_CLASS_UNKNOWN),

+    mExpectedGLVersion(0.f),

+    mGPUSupported(false)

+{

+}

+

+#endif // LL_LLFEATUREMANAGER_H