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

diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index cf53d07f2f..2cd5f2f117 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -1,294 +1,294 @@
-/** 
- * @file llviewertexturelist.h
- * @brief Object for managing the list of images within a region
- *
- * $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_LLVIEWERTEXTURELIST_H					
-#define LL_LLVIEWERTEXTURELIST_H
-
-#include "lluuid.h"
-//#include "message.h"
-#include "llgl.h"
-#include "llviewertexture.h"
-#include "llui.h"
-#include <list>
-#include <set>
-#include "lluiimage.h"
-
-const U32 LL_IMAGE_REZ_LOSSLESS_CUTOFF = 128;
-
-const bool MIPMAP_YES = true;
-const bool MIPMAP_NO = false;
-
-const bool GL_TEXTURE_YES = true;
-const bool GL_TEXTURE_NO = false;
-
-const bool IMMEDIATE_YES = true;
-const bool IMMEDIATE_NO = false;
-
-class LLImageJ2C;
-class LLMessageSystem;
-class LLTextureView;
-
-typedef	void (*LLImageCallback)(bool success,
-								LLViewerFetchedTexture *src_vi,
-								LLImageRaw* src,
-								LLImageRaw* src_aux,
-								S32 discard_level,
-								bool final,
-								void* userdata);
-
-enum ETexListType
-{
-    TEX_LIST_STANDARD = 0,
-    TEX_LIST_SCALE
-};
-
-struct LLTextureKey
-{
-    LLTextureKey();
-    LLTextureKey(LLUUID id, ETexListType tex_type);
-    LLUUID textureId;
-    ETexListType textureType;
-
-    friend bool operator<(const LLTextureKey& key1, const LLTextureKey& key2)
-    {
-        if (key1.textureId != key2.textureId)
-        {
-            return key1.textureId < key2.textureId;
-        }
-        else
-        {
-            return key1.textureType < key2.textureType;
-        }
-    }
-};
-
-class LLViewerTextureList
-{
-	friend class LLTextureView;
-	friend class LLViewerTextureManager;
-	friend class LLLocalBitmap;
-	
-public:
-    static bool createUploadFile(LLPointer<LLImageRaw> raw_image,
-                                 const std::string& out_filename,
-                                 const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,
-                                 const S32 min_image_dimentions = 0);
-    static bool createUploadFile(const std::string& filename,
-                                 const std::string& out_filename,
-                                 const U8 codec,
-                                 const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,
-                                 const S32 min_image_dimentions = 0,
-                                 bool force_square = false);
-	static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image,
-                                                     const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,
-                                                     bool force_square = false,
-                                                     bool force_lossless = false);
-	static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data );
-
-public:
-	LLViewerTextureList();
-	~LLViewerTextureList();
-
-	void init();
-	void shutdown();
-	void dump();
-	void destroyGL(bool save_state = true);
-	void restoreGL();
-	bool isInitialized() const {return mInitialized;}
-
-	void findTexturesByID(const LLUUID &image_id, std::vector<LLViewerFetchedTexture*> &output);
-	LLViewerFetchedTexture *findImage(const LLUUID &image_id, ETexListType tex_type);
-	LLViewerFetchedTexture *findImage(const LLTextureKey &search_key);
-
-	void dirtyImage(LLViewerFetchedTexture *image);
-	
-	// Using image stats, determine what images are necessary, and perform image updates.
-	void updateImages(F32 max_time);
-	void forceImmediateUpdate(LLViewerFetchedTexture* imagep) ;
-
-	// Decode and create textures for all images currently in list.
-	void decodeAllImages(F32 max_decode_time); 
-
-	void handleIRCallback(void **data, const S32 number);
-
-	S32 getNumImages()					{ return mImageList.size(); }
-
-	// Local UI images
-    // Local UI images
-	void doPreloadImages();
-    // Network images. Needs caps and cache to work
-	void doPrefetchImages();
-
-	void clearFetchingRequests();
-	void setDebugFetching(LLViewerFetchedTexture* tex, S32 debug_level);
-
-private:
-    // do some book keeping on the specified texture
-    // - updates decode priority
-    // - updates desired discard level
-    // - cleans up textures that haven't been referenced in awhile
-    void updateImageDecodePriority(LLViewerFetchedTexture* imagep);
-	F32  updateImagesCreateTextures(F32 max_time);
-	F32  updateImagesFetchTextures(F32 max_time);
-	void updateImagesUpdateStats();
-	F32  updateImagesLoadingFastCache(F32 max_time);
-
-	void addImage(LLViewerFetchedTexture *image, ETexListType tex_type);
-	void deleteImage(LLViewerFetchedTexture *image);
-
-	void addImageToList(LLViewerFetchedTexture *image);
-	void removeImageFromList(LLViewerFetchedTexture *image);
-
-	LLViewerFetchedTexture * getImage(const LLUUID &image_id,									 
-									 FTType f_type = FTT_DEFAULT,
-									 bool usemipmap = true,
-									 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,		// Get the requested level immediately upon creation.
-									 S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
-									 LLGLint internal_format = 0,
-									 LLGLenum primary_format = 0,
-									 LLHost request_from_host = LLHost()
-									 );
-	
-	LLViewerFetchedTexture * getImageFromFile(const std::string& filename,									 
-									 FTType f_type = FTT_LOCAL_FILE,
-									 bool usemipmap = true,
-									 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,		// Get the requested level immediately upon creation.
-									 S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
-									 LLGLint internal_format = 0,
-									 LLGLenum primary_format = 0,
-									 const LLUUID& force_id = LLUUID::null
-									 );
-	
-	LLViewerFetchedTexture* getImageFromUrl(const std::string& url,
-									 FTType f_type,
-									 bool usemipmap = true,
-									 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,		// Get the requested level immediately upon creation.
-									 S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
-									 LLGLint internal_format = 0,
-									 LLGLenum primary_format = 0,
-									 const LLUUID& force_id = LLUUID::null
-									 );
-
-	LLViewerFetchedTexture* createImage(const LLUUID &image_id,
-									 FTType f_type,
-									 bool usemipmap = true,
-									 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,		// Get the requested level immediately upon creation.
-									 S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,
-									 LLGLint internal_format = 0,
-									 LLGLenum primary_format = 0,
-									 LLHost request_from_host = LLHost()
-									 );
-	
-	// Request image from a specific host, used for baked avatar textures.
-	// Implemented in header in case someone changes default params above. JC
-	LLViewerFetchedTexture* getImageFromHost(const LLUUID& image_id, FTType f_type, LLHost host)
-	{ return getImage(image_id, f_type, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, host); }	
-
-public:
-	typedef std::set<LLPointer<LLViewerFetchedTexture> > image_list_t;	
-	image_list_t mLoadingStreamList;
-	image_list_t mCreateTextureList;
-	image_list_t mCallbackList;
-	image_list_t mFastCacheList;
-
-	// Note: just raw pointers because they are never referenced, just compared against
-	std::set<LLViewerFetchedTexture*> mDirtyTextureList;
-	
-	bool mForceResetTextureStats;
-    
-private:
-    typedef std::map< LLTextureKey, LLPointer<LLViewerFetchedTexture> > uuid_map_t;
-    uuid_map_t mUUIDMap;
-    LLTextureKey mLastUpdateKey;
-	
-    typedef std::set < LLPointer<LLViewerFetchedTexture> > image_priority_list_t;
-	image_priority_list_t mImageList;
-
-	// simply holds on to LLViewerFetchedTexture references to stop them from being purged too soon
-	std::set<LLPointer<LLViewerFetchedTexture> > mImagePreloads;
-
-	bool mInitialized ;
-	LLFrameTimer mForceDecodeTimer;
-	
-private:
-	static S32 sNumImages;
-	static void (*sUUIDCallback)(void**, const LLUUID &);
-    LOG_CLASS(LLViewerTextureList);
-};
-
-class LLUIImageList : public LLImageProviderInterface, public LLSingleton<LLUIImageList>
-{
-	LLSINGLETON_EMPTY_CTOR(LLUIImageList);
-public:
-	// LLImageProviderInterface
-	/*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority) override;
-	/*virtual*/ LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority) override;
-	void cleanUp() override;
-
-	bool initFromFile();
-
-	LLPointer<LLUIImage> preloadUIImage(const std::string& name, const std::string& filename, bool use_mips, const LLRect& scale_rect, const LLRect& clip_rect, LLUIImage::EScaleStyle stype);
-	
-	static void onUIImageLoaded( bool success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, bool final, void* userdata );
-private:
-	LLPointer<LLUIImage> loadUIImageByName(const std::string& name, const std::string& filename,
-		                           bool use_mips = false, const LLRect& scale_rect = LLRect::null, 
-								   const LLRect& clip_rect = LLRect::null,
-		                           LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,
-								   LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);
-	LLPointer<LLUIImage> loadUIImageByID(const LLUUID& id,
-								 bool use_mips = false, const LLRect& scale_rect = LLRect::null, 
-								 const LLRect& clip_rect = LLRect::null,
-								 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,
-								 LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);
-
-	LLPointer<LLUIImage> loadUIImage(LLViewerFetchedTexture* imagep, const std::string& name, bool use_mips = false, const LLRect& scale_rect = LLRect::null, const LLRect& clip_rect = LLRect::null, LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);
-
-
-	struct LLUIImageLoadData
-	{
-		std::string mImageName;
-		LLRect mImageScaleRegion;
-		LLRect mImageClipRegion;
-	};
-
-	typedef std::map< std::string, LLPointer<LLUIImage> > uuid_ui_image_map_t;
-	uuid_ui_image_map_t mUIImages;
-
-	//
-	//keep a copy of UI textures to prevent them to be deleted.
-	//mGLTexturep of each UI texture equals to some LLUIImage.mImage.
-	std::list< LLPointer<LLViewerFetchedTexture> > mUITextureList ;
-};
-
-const bool GLTEXTURE_TRUE = true;
-const bool GLTEXTURE_FALSE = false;
-const bool MIPMAP_TRUE = true;
-const bool MIPMAP_FALSE = false;
-
-extern LLViewerTextureList gTextureList;
-
-#endif
+/**

+ * @file llviewertexturelist.h

+ * @brief Object for managing the list of images within a region

+ *

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

+#define LL_LLVIEWERTEXTURELIST_H

+

+#include "lluuid.h"

+//#include "message.h"

+#include "llgl.h"

+#include "llviewertexture.h"

+#include "llui.h"

+#include <list>

+#include <set>

+#include "lluiimage.h"

+

+const U32 LL_IMAGE_REZ_LOSSLESS_CUTOFF = 128;

+

+const bool MIPMAP_YES = true;

+const bool MIPMAP_NO = false;

+

+const bool GL_TEXTURE_YES = true;

+const bool GL_TEXTURE_NO = false;

+

+const bool IMMEDIATE_YES = true;

+const bool IMMEDIATE_NO = false;

+

+class LLImageJ2C;

+class LLMessageSystem;

+class LLTextureView;

+

+typedef void (*LLImageCallback)(bool success,

+                                LLViewerFetchedTexture *src_vi,

+                                LLImageRaw* src,

+                                LLImageRaw* src_aux,

+                                S32 discard_level,

+                                bool final,

+                                void* userdata);

+

+enum ETexListType

+{

+    TEX_LIST_STANDARD = 0,

+    TEX_LIST_SCALE

+};

+

+struct LLTextureKey

+{

+    LLTextureKey();

+    LLTextureKey(LLUUID id, ETexListType tex_type);

+    LLUUID textureId;

+    ETexListType textureType;

+

+    friend bool operator<(const LLTextureKey& key1, const LLTextureKey& key2)

+    {

+        if (key1.textureId != key2.textureId)

+        {

+            return key1.textureId < key2.textureId;

+        }

+        else

+        {

+            return key1.textureType < key2.textureType;

+        }

+    }

+};

+

+class LLViewerTextureList

+{

+    friend class LLTextureView;

+    friend class LLViewerTextureManager;

+    friend class LLLocalBitmap;

+

+public:

+    static bool createUploadFile(LLPointer<LLImageRaw> raw_image,

+                                 const std::string& out_filename,

+                                 const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,

+                                 const S32 min_image_dimentions = 0);

+    static bool createUploadFile(const std::string& filename,

+                                 const std::string& out_filename,

+                                 const U8 codec,

+                                 const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,

+                                 const S32 min_image_dimentions = 0,

+                                 bool force_square = false);

+    static LLPointer<LLImageJ2C> convertToUploadFile(LLPointer<LLImageRaw> raw_image,

+                                                     const S32 max_image_dimentions = LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT,

+                                                     bool force_square = false,

+                                                     bool force_lossless = false);

+    static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data );

+

+public:

+    LLViewerTextureList();

+    ~LLViewerTextureList();

+

+    void init();

+    void shutdown();

+    void dump();

+    void destroyGL(bool save_state = true);

+    void restoreGL();

+    bool isInitialized() const {return mInitialized;}

+

+    void findTexturesByID(const LLUUID &image_id, std::vector<LLViewerFetchedTexture*> &output);

+    LLViewerFetchedTexture *findImage(const LLUUID &image_id, ETexListType tex_type);

+    LLViewerFetchedTexture *findImage(const LLTextureKey &search_key);

+

+    void dirtyImage(LLViewerFetchedTexture *image);

+

+    // Using image stats, determine what images are necessary, and perform image updates.

+    void updateImages(F32 max_time);

+    void forceImmediateUpdate(LLViewerFetchedTexture* imagep) ;

+

+    // Decode and create textures for all images currently in list.

+    void decodeAllImages(F32 max_decode_time);

+

+    void handleIRCallback(void **data, const S32 number);

+

+    S32 getNumImages()                  { return mImageList.size(); }

+

+    // Local UI images

+    // Local UI images

+    void doPreloadImages();

+    // Network images. Needs caps and cache to work

+    void doPrefetchImages();

+

+    void clearFetchingRequests();

+    void setDebugFetching(LLViewerFetchedTexture* tex, S32 debug_level);

+

+private:

+    // do some book keeping on the specified texture

+    // - updates decode priority

+    // - updates desired discard level

+    // - cleans up textures that haven't been referenced in awhile

+    void updateImageDecodePriority(LLViewerFetchedTexture* imagep);

+    F32  updateImagesCreateTextures(F32 max_time);

+    F32  updateImagesFetchTextures(F32 max_time);

+    void updateImagesUpdateStats();

+    F32  updateImagesLoadingFastCache(F32 max_time);

+

+    void addImage(LLViewerFetchedTexture *image, ETexListType tex_type);

+    void deleteImage(LLViewerFetchedTexture *image);

+

+    void addImageToList(LLViewerFetchedTexture *image);

+    void removeImageFromList(LLViewerFetchedTexture *image);

+

+    LLViewerFetchedTexture * getImage(const LLUUID &image_id,

+                                     FTType f_type = FTT_DEFAULT,

+                                     bool usemipmap = true,

+                                     LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,     // Get the requested level immediately upon creation.

+                                     S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,

+                                     LLGLint internal_format = 0,

+                                     LLGLenum primary_format = 0,

+                                     LLHost request_from_host = LLHost()

+                                     );

+

+    LLViewerFetchedTexture * getImageFromFile(const std::string& filename,

+                                     FTType f_type = FTT_LOCAL_FILE,

+                                     bool usemipmap = true,

+                                     LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,     // Get the requested level immediately upon creation.

+                                     S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,

+                                     LLGLint internal_format = 0,

+                                     LLGLenum primary_format = 0,

+                                     const LLUUID& force_id = LLUUID::null

+                                     );

+

+    LLViewerFetchedTexture* getImageFromUrl(const std::string& url,

+                                     FTType f_type,

+                                     bool usemipmap = true,

+                                     LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,     // Get the requested level immediately upon creation.

+                                     S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,

+                                     LLGLint internal_format = 0,

+                                     LLGLenum primary_format = 0,

+                                     const LLUUID& force_id = LLUUID::null

+                                     );

+

+    LLViewerFetchedTexture* createImage(const LLUUID &image_id,

+                                     FTType f_type,

+                                     bool usemipmap = true,

+                                     LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_NONE,     // Get the requested level immediately upon creation.

+                                     S8 texture_type = LLViewerTexture::FETCHED_TEXTURE,

+                                     LLGLint internal_format = 0,

+                                     LLGLenum primary_format = 0,

+                                     LLHost request_from_host = LLHost()

+                                     );

+

+    // Request image from a specific host, used for baked avatar textures.

+    // Implemented in header in case someone changes default params above. JC

+    LLViewerFetchedTexture* getImageFromHost(const LLUUID& image_id, FTType f_type, LLHost host)

+    { return getImage(image_id, f_type, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE, 0, 0, host); }

+

+public:

+    typedef std::set<LLPointer<LLViewerFetchedTexture> > image_list_t;

+    image_list_t mLoadingStreamList;

+    image_list_t mCreateTextureList;

+    image_list_t mCallbackList;

+    image_list_t mFastCacheList;

+

+    // Note: just raw pointers because they are never referenced, just compared against

+    std::set<LLViewerFetchedTexture*> mDirtyTextureList;

+

+    bool mForceResetTextureStats;

+

+private:

+    typedef std::map< LLTextureKey, LLPointer<LLViewerFetchedTexture> > uuid_map_t;

+    uuid_map_t mUUIDMap;

+    LLTextureKey mLastUpdateKey;

+

+    typedef std::set < LLPointer<LLViewerFetchedTexture> > image_priority_list_t;

+    image_priority_list_t mImageList;

+

+    // simply holds on to LLViewerFetchedTexture references to stop them from being purged too soon

+    std::set<LLPointer<LLViewerFetchedTexture> > mImagePreloads;

+

+    bool mInitialized ;

+    LLFrameTimer mForceDecodeTimer;

+

+private:

+    static S32 sNumImages;

+    static void (*sUUIDCallback)(void**, const LLUUID &);

+    LOG_CLASS(LLViewerTextureList);

+};

+

+class LLUIImageList : public LLImageProviderInterface, public LLSingleton<LLUIImageList>

+{

+    LLSINGLETON_EMPTY_CTOR(LLUIImageList);

+public:

+    // LLImageProviderInterface

+    /*virtual*/ LLPointer<LLUIImage> getUIImageByID(const LLUUID& id, S32 priority) override;

+    /*virtual*/ LLPointer<LLUIImage> getUIImage(const std::string& name, S32 priority) override;

+    void cleanUp() override;

+

+    bool initFromFile();

+

+    LLPointer<LLUIImage> preloadUIImage(const std::string& name, const std::string& filename, bool use_mips, const LLRect& scale_rect, const LLRect& clip_rect, LLUIImage::EScaleStyle stype);

+

+    static void onUIImageLoaded( bool success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, bool final, void* userdata );

+private:

+    LLPointer<LLUIImage> loadUIImageByName(const std::string& name, const std::string& filename,

+                                   bool use_mips = false, const LLRect& scale_rect = LLRect::null,

+                                   const LLRect& clip_rect = LLRect::null,

+                                   LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,

+                                   LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);

+    LLPointer<LLUIImage> loadUIImageByID(const LLUUID& id,

+                                 bool use_mips = false, const LLRect& scale_rect = LLRect::null,

+                                 const LLRect& clip_rect = LLRect::null,

+                                 LLViewerTexture::EBoostLevel boost_priority = LLGLTexture::BOOST_UI,

+                                 LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);

+

+    LLPointer<LLUIImage> loadUIImage(LLViewerFetchedTexture* imagep, const std::string& name, bool use_mips = false, const LLRect& scale_rect = LLRect::null, const LLRect& clip_rect = LLRect::null, LLUIImage::EScaleStyle = LLUIImage::SCALE_INNER);

+

+

+    struct LLUIImageLoadData

+    {

+        std::string mImageName;

+        LLRect mImageScaleRegion;

+        LLRect mImageClipRegion;

+    };

+

+    typedef std::map< std::string, LLPointer<LLUIImage> > uuid_ui_image_map_t;

+    uuid_ui_image_map_t mUIImages;

+

+    //

+    //keep a copy of UI textures to prevent them to be deleted.

+    //mGLTexturep of each UI texture equals to some LLUIImage.mImage.

+    std::list< LLPointer<LLViewerFetchedTexture> > mUITextureList ;

+};

+

+const bool GLTEXTURE_TRUE = true;

+const bool GLTEXTURE_FALSE = false;

+const bool MIPMAP_TRUE = true;

+const bool MIPMAP_FALSE = false;

+

+extern LLViewerTextureList gTextureList;

+

+#endif