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/llimage/llimagedimensionsinfo.h b/indra/llimage/llimagedimensionsinfo.h
index ade283bb85..681d66ae4e 100644
--- a/indra/llimage/llimagedimensionsinfo.h
+++ b/indra/llimage/llimagedimensionsinfo.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llimagedimentionsinfo.h
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, 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$
  */
@@ -37,24 +37,24 @@
 class LLImageDimensionsInfo
 {
 public:
-	LLImageDimensionsInfo():
-		mData(NULL)
-		,mHeight(0)
-		,mWidth(0)
-	{}
-	~LLImageDimensionsInfo()
-	{
-		clean();
-	}
-
-	bool load(const std::string& src_filename,U32 codec);
-	S32 getWidth() const { return mWidth;}
-	S32 getHeight() const { return mHeight;}
-
-	const std::string& getLastError()
-	{
-		return mLastError;
-	}
+    LLImageDimensionsInfo():
+        mData(NULL)
+        ,mHeight(0)
+        ,mWidth(0)
+    {}
+    ~LLImageDimensionsInfo()
+    {
+        clean();
+    }
+
+    bool load(const std::string& src_filename,U32 codec);
+    S32 getWidth() const { return mWidth;}
+    S32 getHeight() const { return mHeight;}
+
+    const std::string& getLastError()
+    {
+        return mLastError;
+    }
 
     const std::string& getWarningName()
     {
@@ -63,83 +63,83 @@ public:
 
 protected:
 
-	void clean()
-	{
-		mInfile.close();
-		delete[] mData;
-		mData = NULL;
-		mWidth = 0;
-		mHeight = 0;
-	}
-
-	U8* getData()
-	{
-		return mData;
-	}
-
-
-	void setLastError(const std::string& message, const std::string& filename)
-	{
-		std::string error = message;
-		if (!filename.empty())
-			error += std::string(" FILE: ") + filename;
-		mLastError = error;
-	}
-
-
-	bool getImageDimensionsBmp();
-	bool getImageDimensionsTga();
-	bool getImageDimensionsPng();
-	bool getImageDimensionsJpeg();
-	
-	S32 read_s32()
-	{
-		char p[4];
-		mInfile.read(&p[0],4);
-		S32 temp =	(((S32)p[3])       & 0x000000FF) |
-					(((S32)p[2] << 8 ) & 0x0000FF00) |
-					(((S32)p[1] << 16) & 0x00FF0000) |
-					(((S32)p[0] << 24) & 0xFF000000);
-
-		return temp;
-	}
-	S32 read_reverse_s32()
-	{
-		char p[4];
-		mInfile.read(&p[0],4);
-		S32 temp =	(((S32)p[0])       & 0x000000FF) |
-					(((S32)p[1] << 8 ) & 0x0000FF00) |
-					(((S32)p[2] << 16) & 0x00FF0000) |
-					(((S32)p[3] << 24) & 0xFF000000);
-
-		return temp;
-	}
-
-	U8 read_byte()
-	{
-		U8 bt;
-		mInfile.read(&bt,1);
-		return bt;
-	}
-
-	U16 read_short()
-	{
-		return read_byte() << 8 | read_byte();
-	}
-
-	/// Check if the file is not shorter than min_len bytes.
-	bool checkFileLength(S32 min_len);
+    void clean()
+    {
+        mInfile.close();
+        delete[] mData;
+        mData = NULL;
+        mWidth = 0;
+        mHeight = 0;
+    }
+
+    U8* getData()
+    {
+        return mData;
+    }
+
+
+    void setLastError(const std::string& message, const std::string& filename)
+    {
+        std::string error = message;
+        if (!filename.empty())
+            error += std::string(" FILE: ") + filename;
+        mLastError = error;
+    }
+
+
+    bool getImageDimensionsBmp();
+    bool getImageDimensionsTga();
+    bool getImageDimensionsPng();
+    bool getImageDimensionsJpeg();
+
+    S32 read_s32()
+    {
+        char p[4];
+        mInfile.read(&p[0],4);
+        S32 temp =  (((S32)p[3])       & 0x000000FF) |
+                    (((S32)p[2] << 8 ) & 0x0000FF00) |
+                    (((S32)p[1] << 16) & 0x00FF0000) |
+                    (((S32)p[0] << 24) & 0xFF000000);
+
+        return temp;
+    }
+    S32 read_reverse_s32()
+    {
+        char p[4];
+        mInfile.read(&p[0],4);
+        S32 temp =  (((S32)p[0])       & 0x000000FF) |
+                    (((S32)p[1] << 8 ) & 0x0000FF00) |
+                    (((S32)p[2] << 16) & 0x00FF0000) |
+                    (((S32)p[3] << 24) & 0xFF000000);
+
+        return temp;
+    }
+
+    U8 read_byte()
+    {
+        U8 bt;
+        mInfile.read(&bt,1);
+        return bt;
+    }
+
+    U16 read_short()
+    {
+        return read_byte() << 8 | read_byte();
+    }
+
+    /// Check if the file is not shorter than min_len bytes.
+    bool checkFileLength(S32 min_len);
 
 protected:
-	LLAPRFile mInfile ;
-	std::string mSrcFilename;
+    LLAPRFile mInfile ;
+    std::string mSrcFilename;
 
-	std::string mLastError;
+    std::string mLastError;
     std::string mWarning;
 
-	U8* mData;
+    U8* mData;
 
-	S32 mWidth;
-	S32 mHeight;
+    S32 mWidth;
+    S32 mHeight;
 };
 #endif