#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed

1 files changed, 156 insertions, 156 deletions

diff --git a/indra/newview/llviewertexturelist.h b/indra/newview/llviewertexturelist.h
index 10a2cfa32a..db68ed396b 100644
--- a/indra/newview/llviewertexturelist.h
+++ b/indra/newview/llviewertexturelist.h
@@ -1,30 +1,30 @@
-/** 
+/**
  * @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					
+#ifndef LL_LLVIEWERTEXTURELIST_H
 #define LL_LLVIEWERTEXTURELIST_H
 
 #include "lluuid.h"
@@ -51,13 +51,13 @@ 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);
+typedef void (*LLImageCallback)(BOOL success,
+                                LLViewerFetchedTexture *src_vi,
+                                LLImageRaw* src,
+                                LLImageRaw* src_aux,
+                                S32 discard_level,
+                                BOOL final,
+                                void* userdata);
 
 enum ETexListType
 {
@@ -87,10 +87,10 @@ struct LLTextureKey
 
 class LLViewerTextureList
 {
-	friend class LLTextureView;
-	friend class LLViewerTextureManager;
-	friend class LLLocalBitmap;
-	
+    friend class LLTextureView;
+    friend class LLViewerTextureManager;
+    friend class LLLocalBitmap;
+
 public:
     static bool createUploadFile(LLPointer<LLImageRaw> raw_image,
                                  const std::string& out_filename,
@@ -102,48 +102,48 @@ public:
                                  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,
+    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 );
+    static void processImageNotInDatabase( LLMessageSystem *msg, void **user_data );
 
 public:
-	LLViewerTextureList();
-	~LLViewerTextureList();
+    LLViewerTextureList();
+    ~LLViewerTextureList();
 
-	void init();
-	void shutdown();
-	void dump();
-	void destroyGL(BOOL save_state = TRUE);
-	void restoreGL();
-	BOOL isInitialized() const {return mInitialized;}
+    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 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) ;
+    void dirtyImage(LLViewerFetchedTexture *image);
 
-	// Decode and create textures for all images currently in list.
-	void decodeAllImages(F32 max_decode_time); 
+    // Using image stats, determine what images are necessary, and perform image updates.
+    void updateImages(F32 max_time);
+    void forceImmediateUpdate(LLViewerFetchedTexture* imagep) ;
 
-	void handleIRCallback(void **data, const S32 number);
+    // Decode and create textures for all images currently in list.
+    void decodeAllImages(F32 max_decode_time);
 
-	S32 getNumImages()					{ return mImageList.size(); }
+    void handleIRCallback(void **data, const S32 number);
 
-	// Local UI images
+    S32 getNumImages()                  { return mImageList.size(); }
+
+    // Local UI images
     // Local UI images
-	void doPreloadImages();
+    void doPreloadImages();
     // Network images. Needs caps and cache to work
-	void doPrefetchImages();
+    void doPrefetchImages();
 
-	void clearFetchingRequests();
-	void setDebugFetching(LLViewerFetchedTexture* tex, S32 debug_level);
+    void clearFetchingRequests();
+    void setDebugFetching(LLViewerFetchedTexture* tex, S32 debug_level);
 
 private:
     // do some book keeping on the specified texture
@@ -151,137 +151,137 @@ private:
     // - 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); }	
+    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;
-    
+    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;
+    image_priority_list_t mImageList;
 
-	// simply holds on to LLViewerFetchedTexture references to stop them from being purged too soon
-	std::set<LLPointer<LLViewerFetchedTexture> > mImagePreloads;
+    // simply holds on to LLViewerFetchedTexture references to stop them from being purged too soon
+    std::set<LLPointer<LLViewerFetchedTexture> > mImagePreloads;
+
+    BOOL mInitialized ;
+    LLFrameTimer mForceDecodeTimer;
 
-	BOOL mInitialized ;
-	LLFrameTimer mForceDecodeTimer;
-	
 private:
-	static S32 sNumImages;
-	static void (*sUUIDCallback)(void**, const LLUUID &);
+    static S32 sNumImages;
+    static void (*sUUIDCallback)(void**, const LLUUID &);
     LOG_CLASS(LLViewerTextureList);
 };
 
 class LLUIImageList : public LLImageProviderInterface, public LLSingleton<LLUIImageList>
 {
-	LLSINGLETON_EMPTY_CTOR(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;
+    // 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();
 
-	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);
 
-	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 );
+    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 ;
+    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;