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

diff --git a/indra/newview/llurl.h b/indra/newview/llurl.h
index 208f1a7562..a1f9e91a5a 100644
--- a/indra/newview/llurl.h
+++ b/indra/newview/llurl.h
@@ -1,95 +1,95 @@
-/** 
- * @file llurl.h
- * @brief Text url class
- *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, 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$
- */
-
-#ifndef LL_LLURL_H
-#define LL_LLURL_H
-
-// splits a URL into its parts, which are:
-//
-//  [URI][AUTHORITY][PATH][FILENAME][EXTENSION][TAG]
-//
-//  e.g. http://www.lindenlab.com/early/bite_me.html#where
-//
-//  URI=       "http"
-//  AUTHORITY= "www.lindenlab.com"
-//  PATH=      "/early/"
-//  FILENAME=  "bite_me"
-//  EXTENSION= "html"
-//  TAG=       "where"
-//
-//
-// test cases:
-//
-// http://www.lindenlab.com/early/bite_me.html#where
-// http://www.lindenlab.com/
-// http://www.lindenlab.com
-// www.lindenlab.com             ?
-// early/bite_me.html#where
-// mailto://test@lindenlab.com
-// mailto:test@lindenlab.com
-//
-//
-
-
-class LLURL
-{
-public:
-	LLURL();
-	LLURL(const LLURL &url);
-	LLURL(const char * url);
-
-	LLURL &operator=(const LLURL &rhs);
-
-	virtual ~LLURL();
-
-	virtual void init (const char * url);
-	virtual void cleanup ();
-
-	bool operator==(const LLURL &rhs) const;
-	bool operator!=(const LLURL &rhs) const;
-
-	virtual const char *getFQURL() const;
-	virtual const char *getFullPath();
-	virtual const char *getAuthority();
-
-	virtual const char *updateRelativePath(const LLURL &url);
-
-	virtual bool  isExtension(const char *compare) {return (!strcmp(mExtension,compare));};
-
-public:	
-	
-	char        mURI[LL_MAX_PATH];		/* Flawfinder: ignore */
-	char        mAuthority[LL_MAX_PATH];		/* Flawfinder: ignore */
-	char        mPath[LL_MAX_PATH];		/* Flawfinder: ignore */
-	char        mFilename[LL_MAX_PATH];		/* Flawfinder: ignore */
-	char        mExtension[LL_MAX_PATH];		/* Flawfinder: ignore */
-	char        mTag[LL_MAX_PATH];		/* Flawfinder: ignore */
-
-	static char sReturnString[LL_MAX_PATH];		/* Flawfinder: ignore */
-};
-
-#endif  // LL_LLURL_H
-
+/**

+ * @file llurl.h

+ * @brief Text url class

+ *

+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, 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$

+ */

+

+#ifndef LL_LLURL_H

+#define LL_LLURL_H

+

+// splits a URL into its parts, which are:

+//

+//  [URI][AUTHORITY][PATH][FILENAME][EXTENSION][TAG]

+//

+//  e.g. http://www.lindenlab.com/early/bite_me.html#where

+//

+//  URI=       "http"

+//  AUTHORITY= "www.lindenlab.com"

+//  PATH=      "/early/"

+//  FILENAME=  "bite_me"

+//  EXTENSION= "html"

+//  TAG=       "where"

+//

+//

+// test cases:

+//

+// http://www.lindenlab.com/early/bite_me.html#where

+// http://www.lindenlab.com/

+// http://www.lindenlab.com

+// www.lindenlab.com             ?

+// early/bite_me.html#where

+// mailto://test@lindenlab.com

+// mailto:test@lindenlab.com

+//

+//

+

+

+class LLURL

+{

+public:

+    LLURL();

+    LLURL(const LLURL &url);

+    LLURL(const char * url);

+

+    LLURL &operator=(const LLURL &rhs);

+

+    virtual ~LLURL();

+

+    virtual void init (const char * url);

+    virtual void cleanup ();

+

+    bool operator==(const LLURL &rhs) const;

+    bool operator!=(const LLURL &rhs) const;

+

+    virtual const char *getFQURL() const;

+    virtual const char *getFullPath();

+    virtual const char *getAuthority();

+

+    virtual const char *updateRelativePath(const LLURL &url);

+

+    virtual bool  isExtension(const char *compare) {return (!strcmp(mExtension,compare));};

+

+public:

+

+    char        mURI[LL_MAX_PATH];      /* Flawfinder: ignore */

+    char        mAuthority[LL_MAX_PATH];        /* Flawfinder: ignore */

+    char        mPath[LL_MAX_PATH];     /* Flawfinder: ignore */

+    char        mFilename[LL_MAX_PATH];     /* Flawfinder: ignore */

+    char        mExtension[LL_MAX_PATH];        /* Flawfinder: ignore */

+    char        mTag[LL_MAX_PATH];      /* Flawfinder: ignore */

+

+    static char sReturnString[LL_MAX_PATH];     /* Flawfinder: ignore */

+};

+

+#endif  // LL_LLURL_H

+