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

diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index 3328a07725..29ea98b2a6 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -1,142 +1,142 @@
-/** 
- * @file llfloaterchangeitemthumbnail.h
- * @brief LLFloaterChangeItemThumbnail class definition
- *
- * $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_LLFLOATERCHANGEITEMTHUMBNAIL_H
-#define LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
-
-#include "llfloater.h"
-#include "llinventoryobserver.h"
-#include "llvoinventorylistener.h"
-
-class LLButton;
-class LLIconCtrl;
-class LLTextBox;
-class LLThumbnailCtrl;
-class LLUICtrl;
-class LLViewerInventoryItem;
-class LLViewerFetchedTexture;
-
-class LLFloaterChangeItemThumbnail : public LLFloater, public LLInventoryObserver, public LLVOInventoryListener
-{
-public:
-    LLFloaterChangeItemThumbnail(const LLSD& key);
-	~LLFloaterChangeItemThumbnail();
-
-    bool postBuild() override;
-    void onOpen(const LLSD& key) override;
-    void onFocusReceived() override;
-    void onMouseEnter(S32 x, S32 y, MASK mask) override;
-
-    bool handleDragAndDrop(
-        S32 x,
-        S32 y,
-        MASK mask,
-        bool drop,
-        EDragAndDropType cargo_type,
-        void *cargo_data,
-        EAcceptance *accept,
-        std::string& tooltip_msg) override;
-
-    void changed(U32 mask) override;
-    void inventoryChanged(LLViewerObject* object,
-        LLInventoryObject::object_list_t* inventory,
-        S32 serial_num,
-        void* user_data) override;
-
-    static bool validateAsset(const LLUUID &asset_id);
-
-private:
-
-    LLInventoryObject* getInventoryObject();
-    void refreshFromInventory();
-    void refreshFromObject(LLInventoryObject* obj);
-
-    static void onUploadLocal(void*);
-    static void onUploadSnapshot(void*);
-    static void onUseTexture(void*);
-    static void onCopyToClipboard(void*);
-    static void onPasteFromClipboard(void*);
-    static void onRemove(void*);
-    static void onRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFloater> handle);
-
-    void assignAndValidateAsset(const LLUUID &asset_id, bool silent = false);
-    static void onImageDataLoaded(bool success,
-        LLViewerFetchedTexture *src_vi,
-        LLImageRaw* src,
-        LLImageRaw* aux_src,
-        S32 discard_level,
-        bool final,
-        void* userdata);
-    static void onFullImageLoaded(bool success,
-                                  LLViewerFetchedTexture* src_vi,
-                                  LLImageRaw* src,
-                                  LLImageRaw* aux_src,
-                                  S32 discard_level,
-                                  bool final,
-                                  void* userdata);
-
-    void showTexturePicker(const LLUUID &thumbnail_id);
-    void onTexturePickerCommit();
-    static void onUploadComplete(const LLUUID& asset_id, const LLUUID& task_id, const uuid_set_t& inventory_ids, LLHandle<LLFloater> handle);
-
-    void setThumbnailId(const LLUUID &new_thumbnail_id);
-    static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& task_id, const LLUUID& inv_obj_id);
-    static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& inv_obj_id, LLInventoryObject* obj);
-
-    enum EToolTipState
-    {
-        TOOLTIP_NONE,
-        TOOLTIP_UPLOAD_LOCAL,
-        TOOLTIP_UPLOAD_SNAPSHOT,
-        TOOLTIP_USE_TEXTURE,
-        TOOLTIP_COPY_TO_CLIPBOARD,
-        TOOLTIP_COPY_FROM_CLIPBOARD,
-        TOOLTIP_REMOVE,
-    };
-
-    void onButtonMouseEnter(LLUICtrl* button, const LLSD& param, EToolTipState state);
-    void onButtonMouseLeave(LLUICtrl* button, const LLSD& param, EToolTipState state);
-
-    bool mObserverInitialized;
-    bool mMultipleThumbnails; // for multiselection
-    EToolTipState mTooltipState;
-    uuid_set_t mItemList;
-    LLUUID mTaskId;
-    LLUUID mExpectingAssetId;
-
-    LLIconCtrl *mItemTypeIcon;
-    LLUICtrl *mItemNameText;
-    LLThumbnailCtrl *mThumbnailCtrl;
-    LLTextBox *mToolTipTextBox;
-    LLTextBox *mMultipleTextBox;
-    LLButton *mCopyToClipboardBtn;
-    LLButton *mPasteFromClipboardBtn;
-    LLButton *mRemoveImageBtn;
-
-    LLHandle<LLFloater> mPickerHandle;
-    LLHandle<LLFloater> mSnapshotHandle;
-};
-#endif  // LL_LLFLOATERCHANGEITEMTHUMBNAIL_H
+/**

+ * @file llfloaterchangeitemthumbnail.h

+ * @brief LLFloaterChangeItemThumbnail class definition

+ *

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

+#define LL_LLFLOATERCHANGEITEMTHUMBNAIL_H

+

+#include "llfloater.h"

+#include "llinventoryobserver.h"

+#include "llvoinventorylistener.h"

+

+class LLButton;

+class LLIconCtrl;

+class LLTextBox;

+class LLThumbnailCtrl;

+class LLUICtrl;

+class LLViewerInventoryItem;

+class LLViewerFetchedTexture;

+

+class LLFloaterChangeItemThumbnail : public LLFloater, public LLInventoryObserver, public LLVOInventoryListener

+{

+public:

+    LLFloaterChangeItemThumbnail(const LLSD& key);

+    ~LLFloaterChangeItemThumbnail();

+

+    bool postBuild() override;

+    void onOpen(const LLSD& key) override;

+    void onFocusReceived() override;

+    void onMouseEnter(S32 x, S32 y, MASK mask) override;

+

+    bool handleDragAndDrop(

+        S32 x,

+        S32 y,

+        MASK mask,

+        bool drop,

+        EDragAndDropType cargo_type,

+        void *cargo_data,

+        EAcceptance *accept,

+        std::string& tooltip_msg) override;

+

+    void changed(U32 mask) override;

+    void inventoryChanged(LLViewerObject* object,

+        LLInventoryObject::object_list_t* inventory,

+        S32 serial_num,

+        void* user_data) override;

+

+    static bool validateAsset(const LLUUID &asset_id);

+

+private:

+

+    LLInventoryObject* getInventoryObject();

+    void refreshFromInventory();

+    void refreshFromObject(LLInventoryObject* obj);

+

+    static void onUploadLocal(void*);

+    static void onUploadSnapshot(void*);

+    static void onUseTexture(void*);

+    static void onCopyToClipboard(void*);

+    static void onPasteFromClipboard(void*);

+    static void onRemove(void*);

+    static void onRemovalConfirmation(const LLSD& notification, const LLSD& response, LLHandle<LLFloater> handle);

+

+    void assignAndValidateAsset(const LLUUID &asset_id, bool silent = false);

+    static void onImageDataLoaded(bool success,

+        LLViewerFetchedTexture *src_vi,

+        LLImageRaw* src,

+        LLImageRaw* aux_src,

+        S32 discard_level,

+        bool final,

+        void* userdata);

+    static void onFullImageLoaded(bool success,

+                                  LLViewerFetchedTexture* src_vi,

+                                  LLImageRaw* src,

+                                  LLImageRaw* aux_src,

+                                  S32 discard_level,

+                                  bool final,

+                                  void* userdata);

+

+    void showTexturePicker(const LLUUID &thumbnail_id);

+    void onTexturePickerCommit();

+    static void onUploadComplete(const LLUUID& asset_id, const LLUUID& task_id, const uuid_set_t& inventory_ids, LLHandle<LLFloater> handle);

+

+    void setThumbnailId(const LLUUID &new_thumbnail_id);

+    static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& task_id, const LLUUID& inv_obj_id);

+    static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& inv_obj_id, LLInventoryObject* obj);

+

+    enum EToolTipState

+    {

+        TOOLTIP_NONE,

+        TOOLTIP_UPLOAD_LOCAL,

+        TOOLTIP_UPLOAD_SNAPSHOT,

+        TOOLTIP_USE_TEXTURE,

+        TOOLTIP_COPY_TO_CLIPBOARD,

+        TOOLTIP_COPY_FROM_CLIPBOARD,

+        TOOLTIP_REMOVE,

+    };

+

+    void onButtonMouseEnter(LLUICtrl* button, const LLSD& param, EToolTipState state);

+    void onButtonMouseLeave(LLUICtrl* button, const LLSD& param, EToolTipState state);

+

+    bool mObserverInitialized;

+    bool mMultipleThumbnails; // for multiselection

+    EToolTipState mTooltipState;

+    uuid_set_t mItemList;

+    LLUUID mTaskId;

+    LLUUID mExpectingAssetId;

+

+    LLIconCtrl *mItemTypeIcon;

+    LLUICtrl *mItemNameText;

+    LLThumbnailCtrl *mThumbnailCtrl;

+    LLTextBox *mToolTipTextBox;

+    LLTextBox *mMultipleTextBox;

+    LLButton *mCopyToClipboardBtn;

+    LLButton *mPasteFromClipboardBtn;

+    LLButton *mRemoveImageBtn;

+

+    LLHandle<LLFloater> mPickerHandle;

+    LLHandle<LLFloater> mSnapshotHandle;

+};

+#endif  // LL_LLFLOATERCHANGEITEMTHUMBNAIL_H