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

diff --git a/indra/llcorehttp/_thread.h b/indra/llcorehttp/_thread.h
index 22b7750bad..6c0e39cf92 100644
--- a/indra/llcorehttp/_thread.h
+++ b/indra/llcorehttp/_thread.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file _thread.h
  * @brief thread type abstraction
  *
@@ -42,79 +42,79 @@ namespace LLCoreInt
 class HttpThread : public RefCounted
 {
 private:
-	HttpThread();							// Not defined
-	void operator=(const HttpThread &);		// Not defined
+    HttpThread();                           // Not defined
+    void operator=(const HttpThread &);     // Not defined
 
-	void at_exit()
-		{
-			// the thread function has exited so we need to release our reference
-			// to ourself so that we will be automagically cleaned up.
-			release();
-		}
+    void at_exit()
+        {
+            // the thread function has exited so we need to release our reference
+            // to ourself so that we will be automagically cleaned up.
+            release();
+        }
 
-	void run()
-		{ // THREAD CONTEXT
+    void run()
+        { // THREAD CONTEXT
 
-			// Take out additional reference for the at_exit handler
-			addRef();
-			boost::this_thread::at_thread_exit(boost::bind(&HttpThread::at_exit, this));
+            // Take out additional reference for the at_exit handler
+            addRef();
+            boost::this_thread::at_thread_exit(boost::bind(&HttpThread::at_exit, this));
 
-			// run the thread function
-			mThreadFunc(this);
+            // run the thread function
+            mThreadFunc(this);
 
-		} // THREAD CONTEXT
+        } // THREAD CONTEXT
 
 protected:
-	virtual ~HttpThread()
-		{
-			delete mThread;
-		}
+    virtual ~HttpThread()
+        {
+            delete mThread;
+        }
 
 public:
-	/// Constructs a thread object for concurrent execution but does
-	/// not start running.  Caller receives on refcount on the thread
-	/// instance.  If the thread is started, another will be taken
-	/// out for the exit handler.
-	explicit HttpThread(boost::function<void (HttpThread *)> threadFunc)
-		: RefCounted(true), // implicit reference
-		  mThreadFunc(threadFunc)
-		{
-			// this creates a boost thread that will call HttpThread::run on this instance
-			// and pass it the threadfunc callable...
-			boost::function<void()> f = boost::bind(&HttpThread::run, this);
-
-			mThread = new boost::thread(f);
-		}
-
-	inline void join()
-		{
-			mThread->join();
-		}
-
-	inline bool timedJoin(S32 millis)
-		{
-			return mThread->timed_join(boost::posix_time::milliseconds(millis));
-		}
-
-	inline bool joinable() const
-		{
-			return mThread->joinable();
-		}
-
-	// A very hostile method to force a thread to quit
-	inline void cancel()
-		{
-			boost::thread::native_handle_type thread(mThread->native_handle());
-#if		LL_WINDOWS
-			TerminateThread(thread, 0);
+    /// Constructs a thread object for concurrent execution but does
+    /// not start running.  Caller receives on refcount on the thread
+    /// instance.  If the thread is started, another will be taken
+    /// out for the exit handler.
+    explicit HttpThread(boost::function<void (HttpThread *)> threadFunc)
+        : RefCounted(true), // implicit reference
+          mThreadFunc(threadFunc)
+        {
+            // this creates a boost thread that will call HttpThread::run on this instance
+            // and pass it the threadfunc callable...
+            boost::function<void()> f = boost::bind(&HttpThread::run, this);
+
+            mThread = new boost::thread(f);
+        }
+
+    inline void join()
+        {
+            mThread->join();
+        }
+
+    inline bool timedJoin(S32 millis)
+        {
+            return mThread->timed_join(boost::posix_time::milliseconds(millis));
+        }
+
+    inline bool joinable() const
+        {
+            return mThread->joinable();
+        }
+
+    // A very hostile method to force a thread to quit
+    inline void cancel()
+        {
+            boost::thread::native_handle_type thread(mThread->native_handle());
+#if     LL_WINDOWS
+            TerminateThread(thread, 0);
 #else
-			pthread_cancel(thread);
+            pthread_cancel(thread);
 #endif
-		}
-	
+        }
+
 private:
-	boost::function<void(HttpThread *)> mThreadFunc;
-	boost::thread * mThread;
+    boost::function<void(HttpThread *)> mThreadFunc;
+    boost::thread * mThread;
 }; // end class HttpThread
 
 } // end namespace LLCoreInt