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/llwindow/lldxhardware.h b/indra/llwindow/lldxhardware.h
index 85b4bffd71..54447a87b3 100644
--- a/indra/llwindow/lldxhardware.h
+++ b/indra/llwindow/lldxhardware.h
@@ -1,126 +1,126 @@
-/** 
- * @file lldxhardware.h
- * @brief LLDXHardware definition
- *
- * $LicenseInfo:firstyear=2001&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_LLDXHARDWARE_H
-#define LL_LLDXHARDWARE_H
-
-#include <map>
-
-#include "stdtypes.h"
-#include "llstring.h"
-#include "llsd.h"
-
-class LLVersion
-{
-public:
-	LLVersion();
-	bool set(const std::string &version_string);
-	S32 getField(const S32 field_num);
-protected:
-	std::string mVersionString;
-	S32 mFields[4];
-	bool mValid;
-};
-
-class LLDXDriverFile
-{
-public:
-	std::string dump();
-
-public:
-	std::string mFilepath;
-	std::string mName;
-	std::string mVersionString;
-	LLVersion mVersion;
-	std::string mDateString;
-};
-
-class LLDXDevice
-{
-public:
-	~LLDXDevice();
-	std::string dump();
-
-	LLDXDriverFile *findDriver(const std::string &driver);
-public:
-	std::string mName;
-	std::string mPCIString;
-	std::string mVendorID;
-	std::string mDeviceID;
-
-	typedef std::map<std::string, LLDXDriverFile *> driver_file_map_t;
-	driver_file_map_t mDriverFiles;
-};
-
-
-class LLDXHardware
-{
-public:
-	LLDXHardware();
-
-	void setWriteDebugFunc(void (*func)(const char*));
-	void cleanup();
-
-	// Returns true on success.
-	// vram_only true does a "light" probe.
-	bool getInfo(bool vram_only);
-
-    // WMI can return multiple GPU drivers
-    // specify which one to output
-    typedef enum {
-        GPU_INTEL,
-        GPU_NVIDIA,
-        GPU_AMD,
-        GPU_ANY
-    } EGPUVendor;
-	std::string getDriverVersionWMI(EGPUVendor vendor);
-
-	S32 getVRAM() const { return mVRAM; }
-
-	LLSD getDisplayInfo();
-
-	// Will get memory of best GPU in MB, return memory on sucsess, 0 on failure
-	// Note: WMI is not accurate in some cases
-	static S32 getMBVideoMemoryViaWMI();
-
-	// Find a particular device that matches the following specs.
-	// Empty strings indicate that you don't care.
-	// You can separate multiple devices with '|' chars to indicate you want
-	// ANY of them to match and return.
-	// LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);
-
-	// std::string dumpDevices();
-public:
-	typedef std::map<std::string, LLDXDevice *> device_map_t;
-	// device_map_t mDevices;
-protected:
-	S32 mVRAM;
-};
-
-extern void (*gWriteDebug)(const char* msg);
-extern LLDXHardware gDXHardware;
-
-#endif // LL_LLDXHARDWARE_H
+/**

+ * @file lldxhardware.h

+ * @brief LLDXHardware definition

+ *

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

+#define LL_LLDXHARDWARE_H

+

+#include <map>

+

+#include "stdtypes.h"

+#include "llstring.h"

+#include "llsd.h"

+

+class LLVersion

+{

+public:

+    LLVersion();

+    bool set(const std::string &version_string);

+    S32 getField(const S32 field_num);

+protected:

+    std::string mVersionString;

+    S32 mFields[4];

+    bool mValid;

+};

+

+class LLDXDriverFile

+{

+public:

+    std::string dump();

+

+public:

+    std::string mFilepath;

+    std::string mName;

+    std::string mVersionString;

+    LLVersion mVersion;

+    std::string mDateString;

+};

+

+class LLDXDevice

+{

+public:

+    ~LLDXDevice();

+    std::string dump();

+

+    LLDXDriverFile *findDriver(const std::string &driver);

+public:

+    std::string mName;

+    std::string mPCIString;

+    std::string mVendorID;

+    std::string mDeviceID;

+

+    typedef std::map<std::string, LLDXDriverFile *> driver_file_map_t;

+    driver_file_map_t mDriverFiles;

+};

+

+

+class LLDXHardware

+{

+public:

+    LLDXHardware();

+

+    void setWriteDebugFunc(void (*func)(const char*));

+    void cleanup();

+

+    // Returns true on success.

+    // vram_only true does a "light" probe.

+    bool getInfo(bool vram_only);

+

+    // WMI can return multiple GPU drivers

+    // specify which one to output

+    typedef enum {

+        GPU_INTEL,

+        GPU_NVIDIA,

+        GPU_AMD,

+        GPU_ANY

+    } EGPUVendor;

+    std::string getDriverVersionWMI(EGPUVendor vendor);

+

+    S32 getVRAM() const { return mVRAM; }

+

+    LLSD getDisplayInfo();

+

+    // Will get memory of best GPU in MB, return memory on sucsess, 0 on failure

+    // Note: WMI is not accurate in some cases

+    static S32 getMBVideoMemoryViaWMI();

+

+    // Find a particular device that matches the following specs.

+    // Empty strings indicate that you don't care.

+    // You can separate multiple devices with '|' chars to indicate you want

+    // ANY of them to match and return.

+    // LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);

+

+    // std::string dumpDevices();

+public:

+    typedef std::map<std::string, LLDXDevice *> device_map_t;

+    // device_map_t mDevices;

+protected:

+    S32 mVRAM;

+};

+

+extern void (*gWriteDebug)(const char* msg);

+extern LLDXHardware gDXHardware;

+

+#endif // LL_LLDXHARDWARE_H