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

diff --git a/indra/newview/llthumbnailctrl.h b/indra/newview/llthumbnailctrl.h
index 330dc1d9b9..d6285e6897 100644
--- a/indra/newview/llthumbnailctrl.h
+++ b/indra/newview/llthumbnailctrl.h
@@ -1,95 +1,95 @@
-/** 
- * @file llthumbnailctrl.h
- * @brief LLThumbnailCtrl base class
- *
- * $LicenseInfo:firstyear=2023&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2023 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_LLTHUMBNAILCTRL_H
-#define LL_LLTHUMBNAILCTRL_H
-
-#include "llui.h"
-#include "lluictrl.h"
-#include "llviewborder.h" // for params
-
-class LLUICtrlFactory;
-class LLUUID;
-class LLViewerFetchedTexture;
-
-//
-// Classes
-//
-
-// 
-class LLThumbnailCtrl
-: public LLUICtrl
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-        Optional<LLViewBorder::Params> border;
-        Optional<LLUIColor>        border_color;
-        Optional<std::string>      image_name;
-        Optional<LLUIImage*>       fallback_image;
-        Optional<bool>             border_visible;
-        Optional<bool>             interactable;
-        Optional<bool>             show_loading;
-        
-		Params();
-	};
-protected:
-    LLThumbnailCtrl(const Params&);
-	friend class LLUICtrlFactory;
-
-public:
-	virtual ~LLThumbnailCtrl();
-
-	virtual void draw() override;
-    void setVisible(bool visible) override;
-
-	virtual void setValue(const LLSD& value ) override;
-    void setInitImmediately(bool val) { mInitImmediately = val; }
-    void clearTexture();
-    
-    virtual bool handleHover(S32 x, S32 y, MASK mask) override;
-
-protected:
-    void initImage();
-    void unloadImage();
-	
-private:
-    bool mBorderVisible;
-    bool mInteractable;
-    bool mShowLoadingPlaceholder;
-    bool mInited;
-    bool mInitImmediately;
-    std::string mLoadingPlaceholderString;
-    LLUUID mImageAssetID;
-    LLViewBorder* mBorder;
-    LLUIColor mBorderColor;
-    
-	LLPointer<LLViewerFetchedTexture> mTexturep;
-    LLPointer<LLUIImage> mImagep;
-    LLPointer<LLUIImage> mFallbackImagep;
-};
-
-#endif
+/**

+ * @file llthumbnailctrl.h

+ * @brief LLThumbnailCtrl base class

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2023 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_LLTHUMBNAILCTRL_H

+#define LL_LLTHUMBNAILCTRL_H

+

+#include "llui.h"

+#include "lluictrl.h"

+#include "llviewborder.h" // for params

+

+class LLUICtrlFactory;

+class LLUUID;

+class LLViewerFetchedTexture;

+

+//

+// Classes

+//

+

+//

+class LLThumbnailCtrl

+: public LLUICtrl

+{

+public:

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

+    {

+        Optional<LLViewBorder::Params> border;

+        Optional<LLUIColor>        border_color;

+        Optional<std::string>      image_name;

+        Optional<LLUIImage*>       fallback_image;

+        Optional<bool>             border_visible;

+        Optional<bool>             interactable;

+        Optional<bool>             show_loading;

+

+        Params();

+    };

+protected:

+    LLThumbnailCtrl(const Params&);

+    friend class LLUICtrlFactory;

+

+public:

+    virtual ~LLThumbnailCtrl();

+

+    virtual void draw() override;

+    void setVisible(bool visible) override;

+

+    virtual void setValue(const LLSD& value ) override;

+    void setInitImmediately(bool val) { mInitImmediately = val; }

+    void clearTexture();

+

+    virtual bool handleHover(S32 x, S32 y, MASK mask) override;

+

+protected:

+    void initImage();

+    void unloadImage();

+

+private:

+    bool mBorderVisible;

+    bool mInteractable;

+    bool mShowLoadingPlaceholder;

+    bool mInited;

+    bool mInitImmediately;

+    std::string mLoadingPlaceholderString;

+    LLUUID mImageAssetID;

+    LLViewBorder* mBorder;

+    LLUIColor mBorderColor;

+

+    LLPointer<LLViewerFetchedTexture> mTexturep;

+    LLPointer<LLUIImage> mImagep;

+    LLPointer<LLUIImage> mFallbackImagep;

+};

+

+#endif