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

diff --git a/indra/newview/lllocalgltfmaterials.h b/indra/newview/lllocalgltfmaterials.h
index 46776430ff..c638454014 100644
--- a/indra/newview/lllocalgltfmaterials.h
+++ b/indra/newview/lllocalgltfmaterials.h
@@ -1,119 +1,119 @@
-/** 
- * @file lllocalrendermaterials.h
- * @brief Local GLTF materials header
- *
- * $LicenseInfo:firstyear=2022&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2022, 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_LOCALGLTFMATERIALS_H
-#define LL_LOCALGLTFMATERIALS_H
-
-#include "lleventtimer.h"
-#include "llpointer.h"
-#include "llgltfmateriallist.h"
-
-class LLScrollListCtrl;
-class LLGLTFMaterial;
-class LLViewerObject;
-class LLTextureEntry;
-
-class LLLocalGLTFMaterial : public LLFetchedGLTFMaterial
-{
-public: /* main */
-    LLLocalGLTFMaterial(std::string filename, S32 index);
-    virtual ~LLLocalGLTFMaterial();
-
-public: /* accessors */
-    std::string	getFilename() const;
-    std::string	getShortName() const;
-    LLUUID		getTrackingID() const;
-    LLUUID		getWorldID() const;
-    S32			getIndexInFile() const;
-
-public:
-    bool updateSelf();
-
-private:
-    bool loadMaterial();
-
-private: /* private enums */
-    enum ELinkStatus
-    {
-        LS_ON,
-        LS_BROKEN,
-    };
-
-    enum EExtension
-    {
-        ET_MATERIAL_GLTF,
-        ET_MATERIAL_GLB,
-    };
-
-private: /* members */
-    std::string mFilename;
-    std::string mShortName;
-    LLUUID      mTrackingID;
-    LLUUID      mWorldID;
-    LLSD        mLastModified;
-    EExtension  mExtension;
-    ELinkStatus mLinkStatus;
-    S32         mUpdateRetries;
-    S32         mMaterialIndex; // Single file can have more than one
-};
-
-class LLLocalGLTFMaterialTimer : public LLEventTimer
-{
-public:
-    LLLocalGLTFMaterialTimer();
-    ~LLLocalGLTFMaterialTimer();
-
-public:
-    void startTimer();
-    void stopTimer();
-    bool isRunning();
-    bool tick();
-};
-
-class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr>
-{
-    LLSINGLETON(LLLocalGLTFMaterialMgr);
-    ~LLLocalGLTFMaterialMgr();
-public:
-    S32          addUnit(const std::vector<std::string>& filenames);
-    S32          addUnit(const std::string& filename); // file can hold multiple materials
-    void         delUnit(LLUUID tracking_id);
-
-    LLUUID       getWorldID(LLUUID tracking_id);
-    bool         isLocal(LLUUID world_id);
-    void         getFilenameAndIndex(LLUUID tracking_id, std::string &filename, S32 &index);
-
-    void         feedScrollList(LLScrollListCtrl* ctrl);
-    void         doUpdates();
-
-private:
-    std::list<LLPointer<LLLocalGLTFMaterial> >    mMaterialList;
-    LLLocalGLTFMaterialTimer           mTimer;
-    typedef std::list<LLPointer<LLLocalGLTFMaterial> >::iterator local_list_iter;
-};
-
-#endif // LL_LOCALGLTFMATERIALS_H
-
+/**

+ * @file lllocalrendermaterials.h

+ * @brief Local GLTF materials header

+ *

+ * $LicenseInfo:firstyear=2022&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2022, 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_LOCALGLTFMATERIALS_H

+#define LL_LOCALGLTFMATERIALS_H

+

+#include "lleventtimer.h"

+#include "llpointer.h"

+#include "llgltfmateriallist.h"

+

+class LLScrollListCtrl;

+class LLGLTFMaterial;

+class LLViewerObject;

+class LLTextureEntry;

+

+class LLLocalGLTFMaterial : public LLFetchedGLTFMaterial

+{

+public: /* main */

+    LLLocalGLTFMaterial(std::string filename, S32 index);

+    virtual ~LLLocalGLTFMaterial();

+

+public: /* accessors */

+    std::string getFilename() const;

+    std::string getShortName() const;

+    LLUUID      getTrackingID() const;

+    LLUUID      getWorldID() const;

+    S32         getIndexInFile() const;

+

+public:

+    bool updateSelf();

+

+private:

+    bool loadMaterial();

+

+private: /* private enums */

+    enum ELinkStatus

+    {

+        LS_ON,

+        LS_BROKEN,

+    };

+

+    enum EExtension

+    {

+        ET_MATERIAL_GLTF,

+        ET_MATERIAL_GLB,

+    };

+

+private: /* members */

+    std::string mFilename;

+    std::string mShortName;

+    LLUUID      mTrackingID;

+    LLUUID      mWorldID;

+    LLSD        mLastModified;

+    EExtension  mExtension;

+    ELinkStatus mLinkStatus;

+    S32         mUpdateRetries;

+    S32         mMaterialIndex; // Single file can have more than one

+};

+

+class LLLocalGLTFMaterialTimer : public LLEventTimer

+{

+public:

+    LLLocalGLTFMaterialTimer();

+    ~LLLocalGLTFMaterialTimer();

+

+public:

+    void startTimer();

+    void stopTimer();

+    bool isRunning();

+    bool tick();

+};

+

+class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr>

+{

+    LLSINGLETON(LLLocalGLTFMaterialMgr);

+    ~LLLocalGLTFMaterialMgr();

+public:

+    S32          addUnit(const std::vector<std::string>& filenames);

+    S32          addUnit(const std::string& filename); // file can hold multiple materials

+    void         delUnit(LLUUID tracking_id);

+

+    LLUUID       getWorldID(LLUUID tracking_id);

+    bool         isLocal(LLUUID world_id);

+    void         getFilenameAndIndex(LLUUID tracking_id, std::string &filename, S32 &index);

+

+    void         feedScrollList(LLScrollListCtrl* ctrl);

+    void         doUpdates();

+

+private:

+    std::list<LLPointer<LLLocalGLTFMaterial> >    mMaterialList;

+    LLLocalGLTFMaterialTimer           mTimer;

+    typedef std::list<LLPointer<LLLocalGLTFMaterial> >::iterator local_list_iter;

+};

+

+#endif // LL_LOCALGLTFMATERIALS_H

+