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

diff --git a/indra/newview/llpaneleditsky.h b/indra/newview/llpaneleditsky.h
index b0d8bc3ff5..34b672f4bb 100644
--- a/indra/newview/llpaneleditsky.h
+++ b/indra/newview/llpaneleditsky.h
@@ -1,175 +1,175 @@
-/**
-* @file llpaneleditsky.h
-* @brief Panels for sky settings
-*
-* $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 LLPANEL_EDIT_SKY_H
-#define LLPANEL_EDIT_SKY_H
-
-#include "llpanel.h"
-#include "llsettingssky.h"
-#include "llfloatereditenvironmentbase.h"
-
-//=========================================================================
-class LLSlider;
-class LLColorSwatchCtrl;
-class LLTextureCtrl;
-
-//=========================================================================
-class LLPanelSettingsSky : public LLSettingsEditPanel
-{
-    LOG_CLASS(LLPanelSettingsSky);
-
-public:
-                            LLPanelSettingsSky();
-
-    virtual void            setSettings(const LLSettingsBase::ptr_t &settings) override   { setSky(std::static_pointer_cast<LLSettingsSky>(settings)); }
-
-    LLSettingsSky::ptr_t    getSky() const                                          { return mSkySettings; }
-    void                    setSky(const LLSettingsSky::ptr_t &sky)                 { mSkySettings = sky; clearIsDirty(); refresh(); }
-
-protected:
-    LLSettingsSky::ptr_t  mSkySettings;
-};
-
-class LLPanelSettingsSkyAtmosTab : public LLPanelSettingsSky
-{
-    LOG_CLASS(LLPanelSettingsSkyAtmosTab);
-
-public:
-                            LLPanelSettingsSkyAtmosTab();
-
-    virtual bool	        postBuild() override;
-    virtual void	        setEnabled(bool enabled) override;
-
-protected:
-    virtual void            refresh() override;
-
-private:
-    void                    onAmbientLightChanged();
-    void                    onBlueHorizonChanged();
-    void                    onBlueDensityChanged();
-    void                    onHazeHorizonChanged();
-    void                    onHazeDensityChanged();
-    void                    onSceneGammaChanged();
-    void                    onDensityMultipChanged();
-    void                    onDistanceMultipChanged();
-    void                    onMaxAltChanged();
-    void                    onMoistureLevelChanged();
-    void                    onDropletRadiusChanged();
-    void                    onIceLevelChanged();
-    void                    onReflectionProbeAmbianceChanged();
-    void                    updateGammaLabel(bool auto_adjust = false);
-
-};
-
-class LLPanelSettingsSkyCloudTab : public LLPanelSettingsSky
-{
-    LOG_CLASS(LLPanelSettingsSkyCloudTab);
-
-public:
-                            LLPanelSettingsSkyCloudTab();
-
-    virtual bool	        postBuild() override;
-    void	                setEnabled(bool enabled) override;
-
-protected:
-    virtual void            refresh() override;
-
-private:
-    void                    onCloudColorChanged();
-    void                    onCloudCoverageChanged();
-    void                    onCloudScaleChanged();
-    void                    onCloudVarianceChanged();
-    void                    onCloudScrollChanged();
-    void                    onCloudMapChanged();
-    void                    onCloudDensityChanged();
-    void                    onCloudDetailChanged();
-};
-
-class LLPanelSettingsSkySunMoonTab : public LLPanelSettingsSky
-{
-    LOG_CLASS(LLPanelSettingsSkySunMoonTab);
-
-public:
-                            LLPanelSettingsSkySunMoonTab();
-
-    virtual bool	        postBuild() override;
-    virtual void	        setEnabled(bool enabled) override;
-
-protected:
-    virtual void            refresh() override;
-
-private:
-    void                    onSunMoonColorChanged();
-    void                    onGlowChanged();
-    void                    onStarBrightnessChanged();
-    void                    onSunRotationChanged();
-    void                    onSunAzimElevChanged();
-    void                    onSunScaleChanged();
-    void                    onSunImageChanged();
-    void                    onMoonRotationChanged();
-    void                    onMoonAzimElevChanged();
-    void                    onMoonScaleChanged();
-    void                    onMoonBrightnessChanged();
-    void                    onMoonImageChanged();
-};
-
-// single subtab of the density settings tab
-class LLPanelSettingsSkyDensityTab : public LLPanelSettingsSky
-{
-    LOG_CLASS(LLPanelSettingsSkyDensityTab);
-
-public:
-    LLPanelSettingsSkyDensityTab();
-
-    virtual bool postBuild() override;
-    virtual void setEnabled(bool enabled) override;
-
-protected:
-    virtual void refresh() override;
-
-    void onRayleighExponentialChanged();
-    void onRayleighExponentialScaleChanged();
-    void onRayleighLinearChanged();
-    void onRayleighConstantChanged();
-    void onRayleighMaxAltitudeChanged();
-
-    void onMieExponentialChanged();
-    void onMieExponentialScaleChanged();
-    void onMieLinearChanged();
-    void onMieConstantChanged();
-    void onMieAnisoFactorChanged();
-    void onMieMaxAltitudeChanged();
-
-    void onAbsorptionExponentialChanged();
-    void onAbsorptionExponentialScaleChanged();
-    void onAbsorptionLinearChanged();
-    void onAbsorptionConstantChanged();
-    void onAbsorptionMaxAltitudeChanged();
-
-    // update the settings for our profile type
-    void updateProfile();
-};
-#endif // LLPANEL_EDIT_SKY_H
+/**

+* @file llpaneleditsky.h

+* @brief Panels for sky settings

+*

+* $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 LLPANEL_EDIT_SKY_H

+#define LLPANEL_EDIT_SKY_H

+

+#include "llpanel.h"

+#include "llsettingssky.h"

+#include "llfloatereditenvironmentbase.h"

+

+//=========================================================================

+class LLSlider;

+class LLColorSwatchCtrl;

+class LLTextureCtrl;

+

+//=========================================================================

+class LLPanelSettingsSky : public LLSettingsEditPanel

+{

+    LOG_CLASS(LLPanelSettingsSky);

+

+public:

+                            LLPanelSettingsSky();

+

+    virtual void            setSettings(const LLSettingsBase::ptr_t &settings) override   { setSky(std::static_pointer_cast<LLSettingsSky>(settings)); }

+

+    LLSettingsSky::ptr_t    getSky() const                                          { return mSkySettings; }

+    void                    setSky(const LLSettingsSky::ptr_t &sky)                 { mSkySettings = sky; clearIsDirty(); refresh(); }

+

+protected:

+    LLSettingsSky::ptr_t  mSkySettings;

+};

+

+class LLPanelSettingsSkyAtmosTab : public LLPanelSettingsSky

+{

+    LOG_CLASS(LLPanelSettingsSkyAtmosTab);

+

+public:

+                            LLPanelSettingsSkyAtmosTab();

+

+    virtual bool            postBuild() override;

+    virtual void            setEnabled(bool enabled) override;

+

+protected:

+    virtual void            refresh() override;

+

+private:

+    void                    onAmbientLightChanged();

+    void                    onBlueHorizonChanged();

+    void                    onBlueDensityChanged();

+    void                    onHazeHorizonChanged();

+    void                    onHazeDensityChanged();

+    void                    onSceneGammaChanged();

+    void                    onDensityMultipChanged();

+    void                    onDistanceMultipChanged();

+    void                    onMaxAltChanged();

+    void                    onMoistureLevelChanged();

+    void                    onDropletRadiusChanged();

+    void                    onIceLevelChanged();

+    void                    onReflectionProbeAmbianceChanged();

+    void                    updateGammaLabel(bool auto_adjust = false);

+

+};

+

+class LLPanelSettingsSkyCloudTab : public LLPanelSettingsSky

+{

+    LOG_CLASS(LLPanelSettingsSkyCloudTab);

+

+public:

+                            LLPanelSettingsSkyCloudTab();

+

+    virtual bool            postBuild() override;

+    void                    setEnabled(bool enabled) override;

+

+protected:

+    virtual void            refresh() override;

+

+private:

+    void                    onCloudColorChanged();

+    void                    onCloudCoverageChanged();

+    void                    onCloudScaleChanged();

+    void                    onCloudVarianceChanged();

+    void                    onCloudScrollChanged();

+    void                    onCloudMapChanged();

+    void                    onCloudDensityChanged();

+    void                    onCloudDetailChanged();

+};

+

+class LLPanelSettingsSkySunMoonTab : public LLPanelSettingsSky

+{

+    LOG_CLASS(LLPanelSettingsSkySunMoonTab);

+

+public:

+                            LLPanelSettingsSkySunMoonTab();

+

+    virtual bool            postBuild() override;

+    virtual void            setEnabled(bool enabled) override;

+

+protected:

+    virtual void            refresh() override;

+

+private:

+    void                    onSunMoonColorChanged();

+    void                    onGlowChanged();

+    void                    onStarBrightnessChanged();

+    void                    onSunRotationChanged();

+    void                    onSunAzimElevChanged();

+    void                    onSunScaleChanged();

+    void                    onSunImageChanged();

+    void                    onMoonRotationChanged();

+    void                    onMoonAzimElevChanged();

+    void                    onMoonScaleChanged();

+    void                    onMoonBrightnessChanged();

+    void                    onMoonImageChanged();

+};

+

+// single subtab of the density settings tab

+class LLPanelSettingsSkyDensityTab : public LLPanelSettingsSky

+{

+    LOG_CLASS(LLPanelSettingsSkyDensityTab);

+

+public:

+    LLPanelSettingsSkyDensityTab();

+

+    virtual bool postBuild() override;

+    virtual void setEnabled(bool enabled) override;

+

+protected:

+    virtual void refresh() override;

+

+    void onRayleighExponentialChanged();

+    void onRayleighExponentialScaleChanged();

+    void onRayleighLinearChanged();

+    void onRayleighConstantChanged();

+    void onRayleighMaxAltitudeChanged();

+

+    void onMieExponentialChanged();

+    void onMieExponentialScaleChanged();

+    void onMieLinearChanged();

+    void onMieConstantChanged();

+    void onMieAnisoFactorChanged();

+    void onMieMaxAltitudeChanged();

+

+    void onAbsorptionExponentialChanged();

+    void onAbsorptionExponentialScaleChanged();

+    void onAbsorptionLinearChanged();

+    void onAbsorptionConstantChanged();

+    void onAbsorptionMaxAltitudeChanged();

+

+    // update the settings for our profile type

+    void updateProfile();

+};

+#endif // LLPANEL_EDIT_SKY_H