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

diff --git a/indra/llcorehttp/bufferstream.h b/indra/llcorehttp/bufferstream.h
index 9327a798aa..93891810aa 100644
--- a/indra/llcorehttp/bufferstream.h
+++ b/indra/llcorehttp/bufferstream.h
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef	_LLCORE_BUFFER_STREAM_H_
-#define	_LLCORE_BUFFER_STREAM_H_
+#ifndef _LLCORE_BUFFER_STREAM_H_
+#define _LLCORE_BUFFER_STREAM_H_
 
 
 #include <sstream>
@@ -85,38 +85,38 @@ namespace LLCore
 class BufferArrayStreamBuf : public std::streambuf
 {
 public:
-	/// Constructor increments the reference count on the
-	/// BufferArray argument and calls release() on destruction.
-	BufferArrayStreamBuf(BufferArray * array);
-	virtual ~BufferArrayStreamBuf();
+    /// Constructor increments the reference count on the
+    /// BufferArray argument and calls release() on destruction.
+    BufferArrayStreamBuf(BufferArray * array);
+    virtual ~BufferArrayStreamBuf();
 
 private:
-	BufferArrayStreamBuf(const BufferArrayStreamBuf &);	// Not defined
-	void operator=(const BufferArrayStreamBuf &);		// Not defined
+    BufferArrayStreamBuf(const BufferArrayStreamBuf &); // Not defined
+    void operator=(const BufferArrayStreamBuf &);       // Not defined
 
 public:
-	// Input interfaces from std::streambuf
-	int_type underflow();
-	int_type uflow();
-	int_type pbackfail(int_type ch);
-	std::streamsize showmanyc();
-
-	// Output interfaces from std::streambuf
-	int_type overflow(int c);
-	std::streamsize xsputn(const char * src, std::streamsize count);
-
-	// Common/misc interfaces from std::streambuf
-	std::streampos seekoff(std::streamoff off, std::ios_base::seekdir way, std::ios_base::openmode which);
-	
+    // Input interfaces from std::streambuf
+    int_type underflow();
+    int_type uflow();
+    int_type pbackfail(int_type ch);
+    std::streamsize showmanyc();
+
+    // Output interfaces from std::streambuf
+    int_type overflow(int c);
+    std::streamsize xsputn(const char * src, std::streamsize count);
+
+    // Common/misc interfaces from std::streambuf
+    std::streampos seekoff(std::streamoff off, std::ios_base::seekdir way, std::ios_base::openmode which);
+
 protected:
-	BufferArray *		mBufferArray;			// Ref counted
-	size_t				mReadCurPos;
-	int					mReadCurBlock;
-	const char *		mReadBegin;
-	const char *		mReadCur;
-	const char *		mReadEnd;
-	size_t				mWriteCurPos;
-	
+    BufferArray *       mBufferArray;           // Ref counted
+    size_t              mReadCurPos;
+    int                 mReadCurBlock;
+    const char *        mReadBegin;
+    const char *        mReadCur;
+    const char *        mReadEnd;
+    size_t              mWriteCurPos;
+
 }; // end class BufferArrayStreamBuf
 
 
@@ -134,20 +134,20 @@ protected:
 class BufferArrayStream : public std::iostream
 {
 public:
-	/// Constructor increments the reference count on the
-	/// BufferArray argument and calls release() on destruction.
-	BufferArrayStream(BufferArray * ba);
-	~BufferArrayStream();
+    /// Constructor increments the reference count on the
+    /// BufferArray argument and calls release() on destruction.
+    BufferArrayStream(BufferArray * ba);
+    ~BufferArrayStream();
 
 protected:
-	BufferArrayStream(const BufferArrayStream &);
-	void operator=(const BufferArrayStream &);
+    BufferArrayStream(const BufferArrayStream &);
+    void operator=(const BufferArrayStream &);
 
 protected:
-	BufferArrayStreamBuf		mStreamBuf;
+    BufferArrayStreamBuf        mStreamBuf;
 }; // end class BufferArrayStream
 
 
 }  // end namespace LLCore
 
-#endif	// _LLCORE_BUFFER_STREAM_H_
+#endif  // _LLCORE_BUFFER_STREAM_H_