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

diff --git a/indra/llcommon/lluriparser.h b/indra/llcommon/lluriparser.h
index 92626b9054..77eb4031d5 100644
--- a/indra/llcommon/lluriparser.h
+++ b/indra/llcommon/lluriparser.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lluriparser.h
  * @author Protey
  * @date 20146-10-07
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2014&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2014, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -35,52 +35,52 @@
 class LL_COMMON_API LLUriParser
 {
 public:
-	LLUriParser(const std::string& u);
-	~LLUriParser();
+    LLUriParser(const std::string& u);
+    ~LLUriParser();
 
-	const char * scheme() const;
-	void sheme (const std::string& s);
+    const char * scheme() const;
+    void sheme (const std::string& s);
 
-	const char * port() const;
-	void port (const std::string& s);
+    const char * port() const;
+    void port (const std::string& s);
 
-	const char * host() const;
-	void host (const std::string& s);
+    const char * host() const;
+    void host (const std::string& s);
 
-	const char * path() const;
-	void path (const std::string& s);
+    const char * path() const;
+    void path (const std::string& s);
 
-	const char * query() const;
-	void query (const std::string& s);
+    const char * query() const;
+    void query (const std::string& s);
 
-	const char * fragment() const;
-	void fragment (const std::string& s);
+    const char * fragment() const;
+    void fragment (const std::string& s);
 
-	const char * normalizedUri() const;
+    const char * normalizedUri() const;
 
-	void extractParts();
-	void glue(std::string& uri) const;
-	void glueFirst(std::string& uri, bool use_scheme = true) const;
-	void glueSecond(std::string& uri) const;
-	bool test() const;
-	S32 normalize();
+    void extractParts();
+    void glue(std::string& uri) const;
+    void glueFirst(std::string& uri, bool use_scheme = true) const;
+    void glueSecond(std::string& uri) const;
+    bool test() const;
+    S32 normalize();
 
 private:
-	S32 parse();
-	void textRangeToString(UriTextRangeA& textRange, std::string& str);
-	std::string mScheme;
-	std::string mHost;
-	std::string mPort;
-	std::string mPath;
-	std::string mQuery;
-	std::string mFragment;
-	std::string mNormalizedUri;
+    S32 parse();
+    void textRangeToString(UriTextRangeA& textRange, std::string& str);
+    std::string mScheme;
+    std::string mHost;
+    std::string mPort;
+    std::string mPath;
+    std::string mQuery;
+    std::string mFragment;
+    std::string mNormalizedUri;
 
-	UriUriA mUri;
+    UriUriA mUri;
 
-	S32 mRes;
-	bool mTmpScheme;
-	bool mNormalizedTmp;
+    S32 mRes;
+    bool mTmpScheme;
+    bool mNormalizedTmp;
 };
 
 #endif // LL_LLURIPARSER_H