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

diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h
index a5d3e50f7c..401740a4c8 100644
--- a/indra/newview/llfloaterfixedenvironment.h
+++ b/indra/newview/llfloaterfixedenvironment.h
@@ -1,138 +1,138 @@
-/** 
- * @file llfloaterfixedenvironment.h
- * @brief Floaters to create and edit fixed settings for sky and water.
- *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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_FLOATERFIXEDENVIRONMENT_H
-#define LL_FLOATERFIXEDENVIRONMENT_H
-
-#include "llfloatereditenvironmentbase.h"
-#include "llsettingsbase.h"
-#include "llflyoutcombobtn.h"
-#include "llinventory.h"
-
-#include "boost/signals2.hpp"
-
-class LLTabContainer;
-class LLButton;
-class LLLineEditor;
-class LLFloaterSettingsPicker;
-class LLFixedSettingCopiedCallback;
-
-/**
- * Floater container for creating and editing fixed environment settings.
- */
-class LLFloaterFixedEnvironment : public LLFloaterEditEnvironmentBase
-{
-    LOG_CLASS(LLFloaterFixedEnvironment);
-public:
-                            LLFloaterFixedEnvironment(const LLSD &key);
-                            ~LLFloaterFixedEnvironment();
-
-    virtual bool	        postBuild()                 override;
-    virtual void            onOpen(const LLSD& key)     override;
-    virtual void            onClose(bool app_quitting)  override;
-
-    void                    setEditSettings(const LLSettingsBase::ptr_t &settings)  { mSettings = settings; clearDirtyFlag(); syncronizeTabs(); refresh(); }
-    virtual LLSettingsBase::ptr_t getEditSettings()   const override                { return mSettings; }
-
-protected:
-    typedef std::function<void()> on_confirm_fn;
-
-    virtual void            refresh()                   override;
-    void                    setEditSettingsAndUpdate(const LLSettingsBase::ptr_t &settings) override;
-    virtual void            syncronizeTabs();
-
-    virtual LLFloaterSettingsPicker *getSettingsPicker() override;
-
-    LLTabContainer *        mTab;
-    LLLineEditor *          mTxtName;
-
-    LLSettingsBase::ptr_t   mSettings;
-
-    LLFlyoutComboBtnCtrl *      mFlyoutControl;
-
-    void                    onInventoryCreated(LLUUID asset_id, LLUUID inventory_id);
-    void                    onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results);
-    void                    onInventoryUpdated(LLUUID asset_id, LLUUID inventory_id, LLSD results);
-
-    virtual void            clearDirtyFlag() override;
-    void                    updatePermissionFlags();
-
-    void                    doSelectFromInventory();
-
-    virtual void            onClickCloseBtn(bool app_quitting = false) override;
-
-private:
-    void                    onNameChanged(const std::string &name);
-
-    void                    onButtonImport();
-    void                    onButtonApply(LLUICtrl *ctrl, const LLSD &data);
-    void                    onButtonLoad();
-
-    void                    onPickerCommitSetting(LLUUID item_id);
-};
-
-class LLFloaterFixedEnvironmentWater : public LLFloaterFixedEnvironment
-{
-    LOG_CLASS(LLFloaterFixedEnvironmentWater);
-
-public:
-    LLFloaterFixedEnvironmentWater(const LLSD &key);
-
-    bool	                postBuild()                 override;
-
-    virtual void            onOpen(const LLSD& key)     override;
-
-protected:
-    virtual void            updateEditEnvironment()     override;
-
-    virtual void            doImportFromDisk()          override;
-    void                    loadWaterSettingFromFile(const std::vector<std::string>& filenames);
-
-private:
-};
-
-class LLFloaterFixedEnvironmentSky : public LLFloaterFixedEnvironment
-{
-    LOG_CLASS(LLFloaterFixedEnvironmentSky);
-
-public:
-    LLFloaterFixedEnvironmentSky(const LLSD &key);
-
-    bool	                postBuild()                 override;
-
-    virtual void            onOpen(const LLSD& key)     override;
-    virtual void            onClose(bool app_quitting)  override;
-
-protected:
-    virtual void            updateEditEnvironment()     override;
-
-    virtual void            doImportFromDisk()          override;
-    void                    loadSkySettingFromFile(const std::vector<std::string>& filenames);
-
-private:
-};
-
-#endif // LL_FLOATERFIXEDENVIRONMENT_H
+/**

+ * @file llfloaterfixedenvironment.h

+ * @brief Floaters to create and edit fixed settings for sky and water.

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2011, 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_FLOATERFIXEDENVIRONMENT_H

+#define LL_FLOATERFIXEDENVIRONMENT_H

+

+#include "llfloatereditenvironmentbase.h"

+#include "llsettingsbase.h"

+#include "llflyoutcombobtn.h"

+#include "llinventory.h"

+

+#include "boost/signals2.hpp"

+

+class LLTabContainer;

+class LLButton;

+class LLLineEditor;

+class LLFloaterSettingsPicker;

+class LLFixedSettingCopiedCallback;

+

+/**

+ * Floater container for creating and editing fixed environment settings.

+ */

+class LLFloaterFixedEnvironment : public LLFloaterEditEnvironmentBase

+{

+    LOG_CLASS(LLFloaterFixedEnvironment);

+public:

+                            LLFloaterFixedEnvironment(const LLSD &key);

+                            ~LLFloaterFixedEnvironment();

+

+    virtual bool            postBuild()                 override;

+    virtual void            onOpen(const LLSD& key)     override;

+    virtual void            onClose(bool app_quitting)  override;

+

+    void                    setEditSettings(const LLSettingsBase::ptr_t &settings)  { mSettings = settings; clearDirtyFlag(); syncronizeTabs(); refresh(); }

+    virtual LLSettingsBase::ptr_t getEditSettings()   const override                { return mSettings; }

+

+protected:

+    typedef std::function<void()> on_confirm_fn;

+

+    virtual void            refresh()                   override;

+    void                    setEditSettingsAndUpdate(const LLSettingsBase::ptr_t &settings) override;

+    virtual void            syncronizeTabs();

+

+    virtual LLFloaterSettingsPicker *getSettingsPicker() override;

+

+    LLTabContainer *        mTab;

+    LLLineEditor *          mTxtName;

+

+    LLSettingsBase::ptr_t   mSettings;

+

+    LLFlyoutComboBtnCtrl *      mFlyoutControl;

+

+    void                    onInventoryCreated(LLUUID asset_id, LLUUID inventory_id);

+    void                    onInventoryCreated(LLUUID asset_id, LLUUID inventory_id, LLSD results);

+    void                    onInventoryUpdated(LLUUID asset_id, LLUUID inventory_id, LLSD results);

+

+    virtual void            clearDirtyFlag() override;

+    void                    updatePermissionFlags();

+

+    void                    doSelectFromInventory();

+

+    virtual void            onClickCloseBtn(bool app_quitting = false) override;

+

+private:

+    void                    onNameChanged(const std::string &name);

+

+    void                    onButtonImport();

+    void                    onButtonApply(LLUICtrl *ctrl, const LLSD &data);

+    void                    onButtonLoad();

+

+    void                    onPickerCommitSetting(LLUUID item_id);

+};

+

+class LLFloaterFixedEnvironmentWater : public LLFloaterFixedEnvironment

+{

+    LOG_CLASS(LLFloaterFixedEnvironmentWater);

+

+public:

+    LLFloaterFixedEnvironmentWater(const LLSD &key);

+

+    bool                    postBuild()                 override;

+

+    virtual void            onOpen(const LLSD& key)     override;

+

+protected:

+    virtual void            updateEditEnvironment()     override;

+

+    virtual void            doImportFromDisk()          override;

+    void                    loadWaterSettingFromFile(const std::vector<std::string>& filenames);

+

+private:

+};

+

+class LLFloaterFixedEnvironmentSky : public LLFloaterFixedEnvironment

+{

+    LOG_CLASS(LLFloaterFixedEnvironmentSky);

+

+public:

+    LLFloaterFixedEnvironmentSky(const LLSD &key);

+

+    bool                    postBuild()                 override;

+

+    virtual void            onOpen(const LLSD& key)     override;

+    virtual void            onClose(bool app_quitting)  override;

+

+protected:

+    virtual void            updateEditEnvironment()     override;

+

+    virtual void            doImportFromDisk()          override;

+    void                    loadSkySettingFromFile(const std::vector<std::string>& filenames);

+

+private:

+};

+

+#endif // LL_FLOATERFIXEDENVIRONMENT_H