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

diff --git a/indra/newview/llfloatermediasettings.h b/indra/newview/llfloatermediasettings.h
index f3a218b9f5..bee392f335 100644
--- a/indra/newview/llfloatermediasettings.h
+++ b/indra/newview/llfloatermediasettings.h
@@ -1,89 +1,89 @@
-/** 
- * @file llfloatermediasettings.cpp
- * @brief Tabbed dialog for media settings - class definition
- *
- * $LicenseInfo:firstyear=2002&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_LLFLOATERMEDIASETTINGS_H
-#define LL_LLFLOATERMEDIASETTINGS_H
-
-#include "llfloater.h"
-#include "lltabcontainer.h"
-
-class LLPanelMediaSettingsGeneral;
-class LLPanelMediaSettingsSecurity;
-class LLPanelMediaSettingsPermissions;
-
-class LLFloaterMediaSettings : 
-	public LLFloater
-{
-public: 
-	LLFloaterMediaSettings(const LLSD& key);
-	~LLFloaterMediaSettings();
-
-	bool postBuild() override;
-    void onOpen(const LLSD& key) override;
-	void onClose(bool app_quitting) override;
-
-	static LLFloaterMediaSettings* getInstance();
-	static bool instanceExists();
-	static void apply();
-	static void initValues( const LLSD& media_settings , bool editable);
-	static void clearValues( bool editable);
-
-	LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;};	
-	const std::string getHomeUrl();	
-	//bool passesWhiteList( const std::string& test_url );
-
-	virtual void	draw() override;
-
-	bool mIdenticalHasMediaInfo;
-	bool mMultipleMedia;
-	bool mMultipleValidMedia;
-	
-protected:
-	LLButton *mOKBtn;
-	LLButton *mCancelBtn;
-	LLButton *mApplyBtn;
-
-	LLTabContainer *mTabContainer;
-	LLPanelMediaSettingsGeneral* mPanelMediaSettingsGeneral;
-	LLPanelMediaSettingsSecurity* mPanelMediaSettingsSecurity;
-	LLPanelMediaSettingsPermissions* mPanelMediaSettingsPermissions;
-
-	static void onBtnOK(void*);
-	static void onBtnCancel(void*);
-	static void onBtnApply(void*);
-	static void onTabChanged(void* user_data, bool from_click);
-	void commitFields();
-
-	static LLFloaterMediaSettings* sInstance;
-
-private:
-
-	bool haveValuesChanged() const;
-	
-	LLSD mInitialValues;
-};
-
-#endif  // LL_LLFLOATERMEDIASETTINGS_H
+/**

+ * @file llfloatermediasettings.cpp

+ * @brief Tabbed dialog for media settings - class definition

+ *

+ * $LicenseInfo:firstyear=2002&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_LLFLOATERMEDIASETTINGS_H

+#define LL_LLFLOATERMEDIASETTINGS_H

+

+#include "llfloater.h"

+#include "lltabcontainer.h"

+

+class LLPanelMediaSettingsGeneral;

+class LLPanelMediaSettingsSecurity;

+class LLPanelMediaSettingsPermissions;

+

+class LLFloaterMediaSettings :

+    public LLFloater

+{

+public:

+    LLFloaterMediaSettings(const LLSD& key);

+    ~LLFloaterMediaSettings();

+

+    bool postBuild() override;

+    void onOpen(const LLSD& key) override;

+    void onClose(bool app_quitting) override;

+

+    static LLFloaterMediaSettings* getInstance();

+    static bool instanceExists();

+    static void apply();

+    static void initValues( const LLSD& media_settings , bool editable);

+    static void clearValues( bool editable);

+

+    LLPanelMediaSettingsSecurity* getPanelSecurity(){return mPanelMediaSettingsSecurity;};

+    const std::string getHomeUrl();

+    //bool passesWhiteList( const std::string& test_url );

+

+    virtual void    draw() override;

+

+    bool mIdenticalHasMediaInfo;

+    bool mMultipleMedia;

+    bool mMultipleValidMedia;

+

+protected:

+    LLButton *mOKBtn;

+    LLButton *mCancelBtn;

+    LLButton *mApplyBtn;

+

+    LLTabContainer *mTabContainer;

+    LLPanelMediaSettingsGeneral* mPanelMediaSettingsGeneral;

+    LLPanelMediaSettingsSecurity* mPanelMediaSettingsSecurity;

+    LLPanelMediaSettingsPermissions* mPanelMediaSettingsPermissions;

+

+    static void onBtnOK(void*);

+    static void onBtnCancel(void*);

+    static void onBtnApply(void*);

+    static void onTabChanged(void* user_data, bool from_click);

+    void commitFields();

+

+    static LLFloaterMediaSettings* sInstance;

+

+private:

+

+    bool haveValuesChanged() const;

+

+    LLSD mInitialValues;

+};

+

+#endif  // LL_LLFLOATERMEDIASETTINGS_H