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, 44 insertions, 18 deletions

diff --git a/indra/newview/llfloaterprofiletexture.h b/indra/newview/llfloaterprofiletexture.h
index 10ab201695..16e2656bc6 100644
--- a/indra/newview/llfloaterprofiletexture.h
+++ b/indra/newview/llfloaterprofiletexture.h
@@ -28,11 +28,50 @@
 #define LL_LLFLOATERPROFILETEXTURE_H
 
 #include "llfloater.h"
+#include "lliconctrl.h"
 #include "llviewertexture.h"
 
 class LLButton;
 class LLImageRaw;
-class LLIconCtrl;
+
+class LLProfileImageCtrl: public LLIconCtrl
+{
+public:
+    struct Params: public LLInitParam::Block<Params, LLIconCtrl::Params>
+    {
+    };
+
+    LLProfileImageCtrl(const Params& p);
+    virtual ~LLProfileImageCtrl();
+
+
+    virtual void setValue(const LLSD& value) override;
+    LLUUID getImageAssetId() { return mImageID; }
+    LLPointer<LLViewerFetchedTexture> getImage() {return mImage;}
+    void draw() override;
+
+    typedef boost::signals2::signal<void(bool success, LLViewerFetchedTexture* imagep)> image_loaded_signal_t;
+    boost::signals2::connection setImageLoadedCallback(const image_loaded_signal_t::slot_type& cb);
+private:
+    void onImageLoaded(bool success, LLViewerFetchedTexture* src_vi);
+    static void onImageLoaded(bool success,
+                              LLViewerFetchedTexture* src_vi,
+                              LLImageRaw* src,
+                              LLImageRaw* aux_src,
+                              S32 discard_level,
+                              bool final,
+                              void* userdata);
+    void releaseTexture();
+
+    void setImageAssetId(const LLUUID& asset_id);
+private:
+    LLPointer<LLViewerFetchedTexture> mImage;
+    LLUUID mImageID;
+    S32 mImageOldBoostLevel;
+    bool mWasNoDelete;
+    image_loaded_signal_t* mImageLoadedSignal;
+    LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList;
+};
 
 class LLFloaterProfileTexture : public LLFloater
 {
@@ -46,36 +85,23 @@ public:
     void resetAsset();
     void loadAsset(const LLUUID &image_id);
 
-
-    static void onTextureLoaded(
-        bool success,
-        LLViewerFetchedTexture *src_vi,
-        LLImageRaw* src,
-        LLImageRaw* aux_src,
-        S32 discard_level,
-        bool final,
-        void* userdata);
+    void onImageLoaded(bool success, LLViewerFetchedTexture* imagep);
 
     void reshape(S32 width, S32 height, bool called_from_parent = true) override;
+
+    LLHandle<LLFloater> getHandle() const { return LLFloater::getHandle(); }
 protected:
     bool postBuild() override;
 
 private:
     void updateDimensions();
 
-    LLUUID mImageID;
-    LLPointer<LLViewerFetchedTexture> mImage;
-    S32 mImageOldBoostLevel;
-    S32 mAssetStatus;
     F32 mContextConeOpacity;
     S32 mLastHeight;
     S32 mLastWidth;
-    bool mUpdateDimensions;
 
     LLHandle<LLView> mOwnerHandle;
-    LLIconCtrl* mProfileIcon;
+    LLProfileImageCtrl* mProfileIcon;
     LLButton* mCloseButton;
-
-    LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList;
 };
 #endif  // LL_LLFLOATERPROFILETEXTURE_H