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

diff --git a/indra/llcorehttp/httphandler.h b/indra/llcorehttp/httphandler.h
index 4cfb2598c7..1bc1e9cfac 100644
--- a/indra/llcorehttp/httphandler.h
+++ b/indra/llcorehttp/httphandler.h
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef	_LLCORE_HTTP_HANDLER_H_
-#define	_LLCORE_HTTP_HANDLER_H_
+#ifndef _LLCORE_HTTP_HANDLER_H_
+#define _LLCORE_HTTP_HANDLER_H_
 
 
 #include "httpcommon.h"
@@ -55,38 +55,38 @@ class HttpResponse;
 /// dangling pointer if lifetimes aren't managed correctly.
 ///
 /// *TODO: public std::enable_shared_from_this<HttpHandler>
-class HttpHandler 
+class HttpHandler
 {
 public:
     typedef std::shared_ptr<HttpHandler>  ptr_t;
     typedef std::weak_ptr<HttpHandler>    wptr_t;
 
-	virtual ~HttpHandler()
-	{ }
+    virtual ~HttpHandler()
+    { }
 
-	/// Method invoked during calls to @see update().  Each invocation
-	/// represents the completion of some requested operation.  Caller
-	/// can identify the request from the handle and interrogate the
-	/// response argument for success/failure, data and other information.
-	///
-	/// @param	handle			Identifier of the request generating
-	///							the notification.
-	/// @param	response		Supplies detailed information about
-	///							the request including status codes
-	///							(both programming and HTTP), HTTP body
-	///							data and encodings, headers, etc.
-	///							The response object is refcounted and
-	///							the called code may retain the object
-	///							by invoking @see addRef() on it.  The
-	///							library itself drops all references to
-	///							to object on return and never touches
-	///							it again.
-	///
-	virtual void onCompleted(HttpHandle handle, HttpResponse * response) = 0;
+    /// Method invoked during calls to @see update().  Each invocation
+    /// represents the completion of some requested operation.  Caller
+    /// can identify the request from the handle and interrogate the
+    /// response argument for success/failure, data and other information.
+    ///
+    /// @param  handle          Identifier of the request generating
+    ///                         the notification.
+    /// @param  response        Supplies detailed information about
+    ///                         the request including status codes
+    ///                         (both programming and HTTP), HTTP body
+    ///                         data and encodings, headers, etc.
+    ///                         The response object is refcounted and
+    ///                         the called code may retain the object
+    ///                         by invoking @see addRef() on it.  The
+    ///                         library itself drops all references to
+    ///                         to object on return and never touches
+    ///                         it again.
+    ///
+    virtual void onCompleted(HttpHandle handle, HttpResponse * response) = 0;
 
 };  // end class HttpHandler
 
 
 }   // end namespace LLCore
 
-#endif	// _LLCORE_HTTP_HANDLER_H_
+#endif  // _LLCORE_HTTP_HANDLER_H_