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

diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h
index 09d81f38de..177a8ea976 100644
--- a/indra/llkdu/llkdumem.h
+++ b/indra/llkdu/llkdumem.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llkdumem.h
  * @brief Helper class for kdu memory management
  *
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -47,106 +47,106 @@
 class LLKDUMemSource: public kdu_core::kdu_compressed_source
 {
 public:
-	LLKDUMemSource(U8 *input_buffer, U32 size)
-	{
-		mData = input_buffer;
-		mSize = size;
-		mCurPos = 0;
-	}
-
-	~LLKDUMemSource()
-	{
-	}
-
-	int read(kdu_core::kdu_byte *buf, int num_bytes)
-	{
-		U32 num_out;
-		num_out = num_bytes;
-
-		if ((mSize - mCurPos) < (U32)num_bytes)
-		{
-			num_out = mSize -mCurPos;
-		}
-		memcpy(buf, mData + mCurPos, num_out);
-		mCurPos += num_out;
-		return num_out;
-	}
-
-	void reset()
-	{
-		mCurPos = 0;
-	}
+    LLKDUMemSource(U8 *input_buffer, U32 size)
+    {
+        mData = input_buffer;
+        mSize = size;
+        mCurPos = 0;
+    }
+
+    ~LLKDUMemSource()
+    {
+    }
+
+    int read(kdu_core::kdu_byte *buf, int num_bytes)
+    {
+        U32 num_out;
+        num_out = num_bytes;
+
+        if ((mSize - mCurPos) < (U32)num_bytes)
+        {
+            num_out = mSize -mCurPos;
+        }
+        memcpy(buf, mData + mCurPos, num_out);
+        mCurPos += num_out;
+        return num_out;
+    }
+
+    void reset()
+    {
+        mCurPos = 0;
+    }
 
 private:
-	U8 *mData;
-	U32 mSize;
-	U32 mCurPos;
+    U8 *mData;
+    U32 mSize;
+    U32 mCurPos;
 };
 
 class LLKDUMemTarget: public kdu_core::kdu_compressed_target
 {
 public:
-	LLKDUMemTarget(U8 *output_buffer, U32 &output_size, const U32 buffer_size)
-	{
-		mData = output_buffer;
-		mSize = buffer_size;
-		mCurPos = 0;
-		mOutputSize = &output_size;
-	}
-
-	~LLKDUMemTarget()
-	{
-	}
-
-	bool write(const kdu_core::kdu_byte *buf, int num_bytes)
-	{
-		U32 num_out;
-		num_out = num_bytes;
-
-		if ((mSize - mCurPos) < (U32)num_bytes)
-		{
-			num_out = mSize - mCurPos;
-			memcpy(mData + mCurPos, buf, num_out);
-			return false;
-		}
-		memcpy(mData + mCurPos, buf, num_out);
-		mCurPos += num_out;
-		*mOutputSize = mCurPos;
-		return true;
-	}
-	
+    LLKDUMemTarget(U8 *output_buffer, U32 &output_size, const U32 buffer_size)
+    {
+        mData = output_buffer;
+        mSize = buffer_size;
+        mCurPos = 0;
+        mOutputSize = &output_size;
+    }
+
+    ~LLKDUMemTarget()
+    {
+    }
+
+    bool write(const kdu_core::kdu_byte *buf, int num_bytes)
+    {
+        U32 num_out;
+        num_out = num_bytes;
+
+        if ((mSize - mCurPos) < (U32)num_bytes)
+        {
+            num_out = mSize - mCurPos;
+            memcpy(mData + mCurPos, buf, num_out);
+            return false;
+        }
+        memcpy(mData + mCurPos, buf, num_out);
+        mCurPos += num_out;
+        *mOutputSize = mCurPos;
+        return true;
+    }
+
 private:
-	U8 *mData;
-	U32 mSize;
-	U32 mCurPos;
-	U32 *mOutputSize;
+    U8 *mData;
+    U32 mSize;
+    U32 mCurPos;
+    U32 *mOutputSize;
 };
 
 class LLKDUMemIn : public kdu_supp::kdu_image_in_base
 {
 public:
-	LLKDUMemIn(const U8 *data,
-				const U32 size,
-				const U16 rows,
-				const U16 cols,
-				U8 in_num_components,
-				kdu_core::siz_params *siz);
-	~LLKDUMemIn();
+    LLKDUMemIn(const U8 *data,
+                const U32 size,
+                const U16 rows,
+                const U16 cols,
+                U8 in_num_components,
+                kdu_core::siz_params *siz);
+    ~LLKDUMemIn();
 
-	bool get(int comp_idx, kdu_core::kdu_line_buf &line, int x_tnum);
+    bool get(int comp_idx, kdu_core::kdu_line_buf &line, int x_tnum);
 
 private:
-	const U8 *mData;
-	int first_comp_idx;
-	int num_components;
-	int rows, cols;
-	int alignment_bytes; // Number of 0's at end of each line.
-	int precision[3];
-	kd_supp_image_local::image_line_buf *incomplete_lines; // Each "sample" represents a full pixel
-	kd_supp_image_local::image_line_buf *free_lines;
-	int num_unread_rows;
-
-	U32 mCurPos;
-	U32 mDataSize;
+    const U8 *mData;
+    int first_comp_idx;
+    int num_components;
+    int rows, cols;
+    int alignment_bytes; // Number of 0's at end of each line.
+    int precision[3];
+    kd_supp_image_local::image_line_buf *incomplete_lines; // Each "sample" represents a full pixel
+    kd_supp_image_local::image_line_buf *free_lines;
+    int num_unread_rows;
+
+    U32 mCurPos;
+    U32 mDataSize;
 };
 #endif