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

diff --git a/indra/llcorehttp/_httprequestqueue.h b/indra/llcorehttp/_httprequestqueue.h
index 52369df174..0823126f78 100644
--- a/indra/llcorehttp/_httprequestqueue.h
+++ b/indra/llcorehttp/_httprequestqueue.h
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef	_LLCORE_HTTP_REQUEST_QUEUE_H_
-#define	_LLCORE_HTTP_REQUEST_QUEUE_H_
+#ifndef _LLCORE_HTTP_REQUEST_QUEUE_H_
+#define _LLCORE_HTTP_REQUEST_QUEUE_H_
 
 
 #include <vector>
@@ -50,94 +50,94 @@ class HttpOperation;
 class HttpRequestQueue : public LLCoreInt::RefCounted
 {
 protected:
-	/// Caller acquires a Refcount on construction
-	HttpRequestQueue();
+    /// Caller acquires a Refcount on construction
+    HttpRequestQueue();
 
 protected:
-	virtual ~HttpRequestQueue();						// Use release()
+    virtual ~HttpRequestQueue();                        // Use release()
 
 private:
-	HttpRequestQueue(const HttpRequestQueue &);			// Not defined
-	void operator=(const HttpRequestQueue &);			// Not defined
+    HttpRequestQueue(const HttpRequestQueue &);         // Not defined
+    void operator=(const HttpRequestQueue &);           // Not defined
 
 public:
     typedef std::shared_ptr<HttpOperation> opPtr_t;
 
-	static void init();
-	static void term();
-	
-	/// Threading:  callable by any thread once inited.
-	inline static HttpRequestQueue * instanceOf()
-		{
-			return sInstance;
-		}
-	
+    static void init();
+    static void term();
+
+    /// Threading:  callable by any thread once inited.
+    inline static HttpRequestQueue * instanceOf()
+        {
+            return sInstance;
+        }
+
 public:
     typedef std::vector<opPtr_t> OpContainer;
 
-	/// Insert an object at the back of the request queue.
-	///
-	/// Caller must provide one refcount to the queue which takes
-	/// possession of the count on success.
-	///
-	/// @return			Standard status.  On failure, caller
-	///					must dispose of the operation with
-	///					an explicit release() call.
-	///
-	/// Threading:  callable by any thread.
+    /// Insert an object at the back of the request queue.
+    ///
+    /// Caller must provide one refcount to the queue which takes
+    /// possession of the count on success.
+    ///
+    /// @return         Standard status.  On failure, caller
+    ///                 must dispose of the operation with
+    ///                 an explicit release() call.
+    ///
+    /// Threading:  callable by any thread.
     HttpStatus addOp(const opPtr_t &op);
 
-	/// Return the operation on the front of the queue.  If
-	/// the queue is empty and @wait is false, call returns
-	/// immediately and a NULL pointer is returned.  If true,
-	/// caller will sleep until explicitly woken.  Wakeups
-	/// can be spurious and callers must expect NULL pointers
-	/// even if waiting is indicated.
-	///
-	/// Caller acquires reference count any returned operation
-	///
-	/// Threading:  callable by any thread.
+    /// Return the operation on the front of the queue.  If
+    /// the queue is empty and @wait is false, call returns
+    /// immediately and a NULL pointer is returned.  If true,
+    /// caller will sleep until explicitly woken.  Wakeups
+    /// can be spurious and callers must expect NULL pointers
+    /// even if waiting is indicated.
+    ///
+    /// Caller acquires reference count any returned operation
+    ///
+    /// Threading:  callable by any thread.
     opPtr_t fetchOp(bool wait);
 
-	/// Return all queued requests to caller.  The @ops argument
-	/// should be empty when called and will be swap()'d with
-	/// current contents.  Handling of the @wait argument is
-	/// identical to @fetchOp.
-	///
-	/// Caller acquires reference count on each returned operation
-	///
-	/// Threading:  callable by any thread.
-	void fetchAll(bool wait, OpContainer & ops);
-
-	/// Wake any sleeping threads.  Normal queuing operations
-	/// won't require this but it may be necessary for termination
-	/// requests.
-	///
-	/// Threading:  callable by any thread.
-	void wakeAll();
-
-	/// Disallow further request queuing.  Callers to @addOp will
-	/// get a failure status (LLCORE, HE_SHUTTING_DOWN).  Callers
-	/// to @fetchAll or @fetchOp will get requests that are on the
-	/// queue but the calls will no longer wait.  Instead they'll
-	/// return immediately.  Also wakes up all sleepers to send
-	/// them on their way.
-	///
-	/// Threading:  callable by any thread.
-	bool stopQueue();
-	
+    /// Return all queued requests to caller.  The @ops argument
+    /// should be empty when called and will be swap()'d with
+    /// current contents.  Handling of the @wait argument is
+    /// identical to @fetchOp.
+    ///
+    /// Caller acquires reference count on each returned operation
+    ///
+    /// Threading:  callable by any thread.
+    void fetchAll(bool wait, OpContainer & ops);
+
+    /// Wake any sleeping threads.  Normal queuing operations
+    /// won't require this but it may be necessary for termination
+    /// requests.
+    ///
+    /// Threading:  callable by any thread.
+    void wakeAll();
+
+    /// Disallow further request queuing.  Callers to @addOp will
+    /// get a failure status (LLCORE, HE_SHUTTING_DOWN).  Callers
+    /// to @fetchAll or @fetchOp will get requests that are on the
+    /// queue but the calls will no longer wait.  Instead they'll
+    /// return immediately.  Also wakes up all sleepers to send
+    /// them on their way.
+    ///
+    /// Threading:  callable by any thread.
+    bool stopQueue();
+
 protected:
-	static HttpRequestQueue *			sInstance;
-	
+    static HttpRequestQueue *           sInstance;
+
 protected:
-	OpContainer							mQueue;
-	LLCoreInt::HttpMutex				mQueueMutex;
-	LLCoreInt::HttpConditionVariable	mQueueCV;
-	bool								mQueueStopped;
-	
+    OpContainer                         mQueue;
+    LLCoreInt::HttpMutex                mQueueMutex;
+    LLCoreInt::HttpConditionVariable    mQueueCV;
+    bool                                mQueueStopped;
+
 }; // end class HttpRequestQueue
 
 }  // end namespace LLCore
 
 
-#endif	// _LLCORE_HTTP_REQUEST_QUEUE_H_
+#endif  // _LLCORE_HTTP_REQUEST_QUEUE_H_