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

diff --git a/indra/llcorehttp/httpheaders.h b/indra/llcorehttp/httpheaders.h
index e7cf4037bf..a5ca7749b0 100644
--- a/indra/llcorehttp/httpheaders.h
+++ b/indra/llcorehttp/httpheaders.h
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef	_LLCORE_HTTP_HEADERS_H_
-#define	_LLCORE_HTTP_HEADERS_H_
+#ifndef _LLCORE_HTTP_HEADERS_H_
+#define _LLCORE_HTTP_HEADERS_H_
 
 
 #include "httpcommon.h"
@@ -77,115 +77,115 @@ namespace LLCore
 class HttpHeaders: private boost::noncopyable
 {
 public:
-	typedef std::pair<std::string, std::string> header_t;
-	typedef std::vector<header_t> container_t;
-	typedef container_t::iterator iterator;
-	typedef container_t::const_iterator const_iterator;
-	typedef container_t::reverse_iterator reverse_iterator;
-	typedef container_t::const_reverse_iterator const_reverse_iterator;
-	typedef container_t::value_type value_type;
-	typedef container_t::size_type size_type;
+    typedef std::pair<std::string, std::string> header_t;
+    typedef std::vector<header_t> container_t;
+    typedef container_t::iterator iterator;
+    typedef container_t::const_iterator const_iterator;
+    typedef container_t::reverse_iterator reverse_iterator;
+    typedef container_t::const_reverse_iterator const_reverse_iterator;
+    typedef container_t::value_type value_type;
+    typedef container_t::size_type size_type;
     typedef std::shared_ptr<HttpHeaders> ptr_t;
 
 public:
-	/// @post In addition to the instance, caller has a refcount
-	/// to the instance.  A call to @see release() will destroy
-	/// the instance.
-	HttpHeaders();
-    virtual ~HttpHeaders();						// Use release()
+    /// @post In addition to the instance, caller has a refcount
+    /// to the instance.  A call to @see release() will destroy
+    /// the instance.
+    HttpHeaders();
+    virtual ~HttpHeaders();                     // Use release()
 
-	//typedef LLCoreInt::IntrusivePtr<HttpHeaders> ptr_t;
+    //typedef LLCoreInt::IntrusivePtr<HttpHeaders> ptr_t;
 protected:
 
-	HttpHeaders(const HttpHeaders &);			// Not defined
-	void operator=(const HttpHeaders &);		// Not defined
+    HttpHeaders(const HttpHeaders &);           // Not defined
+    void operator=(const HttpHeaders &);        // Not defined
 
 public:
-	// Empty the list of headers.
-	void clear();
-
-	// Append a name/value pair supplied as either std::strings
-	// or NUL-terminated char * to the header list.  No normalization
-	// is performed on the strings.  No conformance test is
-	// performed (names may contain spaces, colons, etc.).
-	//
-	void append(const std::string & name, const std::string & value);
-	void append(const char * name, const char * value);
-
-	// Extract a name/value pair from a raw byte array using
-	// the first colon character as a separator.  Input string
-	// does not need to be NUL-terminated.  Resulting name/value
-	// pair is appended to the header list.
-	//
-	// Normalization is performed on the name/value pair as
-	// follows:
-	// - name is lower-cased according to mostly ASCII rules
-	// - name is left- and right-trimmed of spaces and tabs
-	// - value is left-trimmed of spaces and tabs
-	// - either or both of name and value may be zero-length
-	//
-	// By convention, headers read from the wire will be normalized
-	// in this fashion prior to delivery to any HttpHandler code.
-	// Headers to be written to the wire are left as appended to
-	// the list.
-	void appendNormal(const char * header, size_t size);
-
-	// Perform a simple, case-sensitive search of the header list
-	// returning a pointer to the value of the last matching header
-	// in the header list.  If none is found, a NULL pointer is returned.
-	//
-	// Any pointer returned references objects in the container itself
-	// and will have the same lifetime as this class.  If you want
-	// the value beyond the lifetime of this instance, make a copy.
-	//
-	// @arg		name	C-style string giving the name of a header
-	//					to search.  The comparison is case-sensitive
-	//					though list entries may have been normalized
-	//					to lower-case.
-	//
-	// @return			NULL if the header wasn't found otherwise
-	//					a pointer to a std::string in the container.
-	//					Pointer is valid only for the lifetime of
-	//					the container or until container is modifed.
-	const std::string * find(const std::string &name) const;
-	const std::string * find(const char * name) const
-	{
-		return find(std::string(name));
-	}
+    // Empty the list of headers.
+    void clear();
+
+    // Append a name/value pair supplied as either std::strings
+    // or NUL-terminated char * to the header list.  No normalization
+    // is performed on the strings.  No conformance test is
+    // performed (names may contain spaces, colons, etc.).
+    //
+    void append(const std::string & name, const std::string & value);
+    void append(const char * name, const char * value);
+
+    // Extract a name/value pair from a raw byte array using
+    // the first colon character as a separator.  Input string
+    // does not need to be NUL-terminated.  Resulting name/value
+    // pair is appended to the header list.
+    //
+    // Normalization is performed on the name/value pair as
+    // follows:
+    // - name is lower-cased according to mostly ASCII rules
+    // - name is left- and right-trimmed of spaces and tabs
+    // - value is left-trimmed of spaces and tabs
+    // - either or both of name and value may be zero-length
+    //
+    // By convention, headers read from the wire will be normalized
+    // in this fashion prior to delivery to any HttpHandler code.
+    // Headers to be written to the wire are left as appended to
+    // the list.
+    void appendNormal(const char * header, size_t size);
+
+    // Perform a simple, case-sensitive search of the header list
+    // returning a pointer to the value of the last matching header
+    // in the header list.  If none is found, a NULL pointer is returned.
+    //
+    // Any pointer returned references objects in the container itself
+    // and will have the same lifetime as this class.  If you want
+    // the value beyond the lifetime of this instance, make a copy.
+    //
+    // @arg     name    C-style string giving the name of a header
+    //                  to search.  The comparison is case-sensitive
+    //                  though list entries may have been normalized
+    //                  to lower-case.
+    //
+    // @return          NULL if the header wasn't found otherwise
+    //                  a pointer to a std::string in the container.
+    //                  Pointer is valid only for the lifetime of
+    //                  the container or until container is modifed.
+    const std::string * find(const std::string &name) const;
+    const std::string * find(const char * name) const
+    {
+        return find(std::string(name));
+    }
 
     // Remove the header from the list if found.
-    // 
+    //
     void remove(const std::string &name);
     void remove(const char *name);
 
-	// Count of headers currently in the list.
-	size_type size() const
-		{
-			return mHeaders.size();
-		}
+    // Count of headers currently in the list.
+    size_type size() const
+        {
+            return mHeaders.size();
+        }
 
-	// Standard std::vector-based forward iterators.
-	iterator begin();
-	const_iterator begin() const;
-	iterator end();
-	const_iterator end() const;
+    // Standard std::vector-based forward iterators.
+    iterator begin();
+    const_iterator begin() const;
+    iterator end();
+    const_iterator end() const;
 
-	// Standard std::vector-based reverse iterators.
-	reverse_iterator rbegin();
-	const_reverse_iterator rbegin() const;
-	reverse_iterator rend();
-	const_reverse_iterator rend() const;
+    // Standard std::vector-based reverse iterators.
+    reverse_iterator rbegin();
+    const_reverse_iterator rbegin() const;
+    reverse_iterator rend();
+    const_reverse_iterator rend() const;
 
 public:
-	// For unit tests only - not a public API
-	container_t &		getContainerTESTONLY();
-	
+    // For unit tests only - not a public API
+    container_t &       getContainerTESTONLY();
+
 protected:
-	container_t			mHeaders;
-	
+    container_t         mHeaders;
+
 }; // end class HttpHeaders
 
 }  // end namespace LLCore
 
 
-#endif	// _LLCORE_HTTP_HEADERS_H_
+#endif  // _LLCORE_HTTP_HEADERS_H_