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

diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp
index a7e1f57f9d..5dc5a7437a 100644
--- a/indra/newview/llpanelsnapshot.cpp
+++ b/indra/newview/llpanelsnapshot.cpp
@@ -1,245 +1,245 @@
-/** 
- * @file llpanelsnapshot.cpp
- * @brief Snapshot panel base class
- *
- * $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$
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "llpanelsnapshot.h"
-
-// libs
-#include "llcombobox.h"
-#include "llfloater.h"
-#include "llfloatersnapshot.h"
-#include "llsliderctrl.h"
-#include "llspinctrl.h"
-#include "lltrans.h"
-
-// newview
-#include "llsidetraypanelcontainer.h"
-#include "llviewercontrol.h" // gSavedSettings
-
-#include "llagentbenefits.h"
-
-constexpr S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512
-
-S32 power_of_two(S32 sz, S32 upper)
-{
-	S32 res = upper;
-	while( upper >= sz)
-	{
-		res = upper;
-		upper >>= 1;
-	}
-	return res;
-}
-
-LLPanelSnapshot::LLPanelSnapshot()
-	: mSnapshotFloater(NULL)
-{}
-
-// virtual
-bool LLPanelSnapshot::postBuild()
-{
-	getChild<LLUICtrl>("save_btn")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()));
-	getChild<LLUICtrl>(getImageSizeComboName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onResolutionComboCommit, this, _1));
-    if (!getWidthSpinnerName().empty())
-    {
-        getChild<LLUICtrl>(getWidthSpinnerName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onCustomResolutionCommit, this));
-    }
-    if (!getHeightSpinnerName().empty())
-    {
-        getChild<LLUICtrl>(getHeightSpinnerName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onCustomResolutionCommit, this));
-    }
-    if (!getAspectRatioCBName().empty())
-    {
-        getChild<LLUICtrl>(getAspectRatioCBName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onKeepAspectRatioCommit, this, _1));
-    }
-	updateControls(LLSD());
-
-	mSnapshotFloater = getParentByType<LLFloaterSnapshotBase>();
-	return true;
-}
-
-// virtual
-void LLPanelSnapshot::onOpen(const LLSD& key)
-{
-	S32 old_format = gSavedSettings.getS32("SnapshotFormat");
-	S32 new_format = (S32) getImageFormat();
-
-	gSavedSettings.setS32("SnapshotFormat", new_format);
-	setCtrlsEnabled(true);
-
-	// Switching panels will likely change image format.
-	// Not updating preview right away may lead to errors,
-	// e.g. attempt to send a large BMP image by email.
-	if (old_format != new_format)
-	{
-        getParentByType<LLFloater>()->notify(LLSD().with("image-format-change", true));
-	}
-}
-
-LLSnapshotModel::ESnapshotFormat LLPanelSnapshot::getImageFormat() const
-{
-	return LLSnapshotModel::SNAPSHOT_FORMAT_JPEG;
-}
-
-void LLPanelSnapshot::enableControls(bool enable)
-{
-	setCtrlsEnabled(enable);
-}
-
-LLSpinCtrl* LLPanelSnapshot::getWidthSpinner()
-{
-    llassert(!getWidthSpinnerName().empty());
-	return getChild<LLSpinCtrl>(getWidthSpinnerName());
-}
-
-LLSpinCtrl* LLPanelSnapshot::getHeightSpinner()
-{
-    llassert(!getHeightSpinnerName().empty());
-	return getChild<LLSpinCtrl>(getHeightSpinnerName());
-}
-
-S32 LLPanelSnapshot::getTypedPreviewWidth() const
-{
-    llassert(!getWidthSpinnerName().empty());
-	return getChild<LLUICtrl>(getWidthSpinnerName())->getValue().asInteger();
-}
-
-S32 LLPanelSnapshot::getTypedPreviewHeight() const
-{
-    llassert(!getHeightSpinnerName().empty());
-    return getChild<LLUICtrl>(getHeightSpinnerName())->getValue().asInteger();
-}
-
-void LLPanelSnapshot::enableAspectRatioCheckbox(bool enable)
-{
-    llassert(!getAspectRatioCBName().empty());
-    getChild<LLUICtrl>(getAspectRatioCBName())->setEnabled(enable);
-}
-
-LLSideTrayPanelContainer* LLPanelSnapshot::getParentContainer()
-{
-	LLSideTrayPanelContainer* parent = dynamic_cast<LLSideTrayPanelContainer*>(getParent());
-	if (!parent)
-	{
-		LL_WARNS() << "Cannot find panel container" << LL_ENDL;
-		return NULL;
-	}
-
-	return parent;
-}
-
-void LLPanelSnapshot::updateImageQualityLevel()
-{
-	LLSliderCtrl* quality_slider = getChild<LLSliderCtrl>("image_quality_slider");
-	S32 quality_val = llfloor((F32) quality_slider->getValue().asReal());
-
-	std::string quality_lvl;
-
-	if (quality_val < 20)
-	{
-		quality_lvl = LLTrans::getString("snapshot_quality_very_low");
-	}
-	else if (quality_val < 40)
-	{
-		quality_lvl = LLTrans::getString("snapshot_quality_low");
-	}
-	else if (quality_val < 60)
-	{
-		quality_lvl = LLTrans::getString("snapshot_quality_medium");
-	}
-	else if (quality_val < 80)
-	{
-		quality_lvl = LLTrans::getString("snapshot_quality_high");
-	}
-	else
-	{
-		quality_lvl = LLTrans::getString("snapshot_quality_very_high");
-	}
-
-	getChild<LLTextBox>("image_quality_level")->setTextArg("[QLVL]", quality_lvl);
-}
-
-void LLPanelSnapshot::goBack()
-{
-	LLSideTrayPanelContainer* parent = getParentContainer();
-	if (parent)
-	{
-		parent->openPreviousPanel();
-		parent->getCurrentPanel()->onOpen(LLSD());
-	}
-}
-
-void LLPanelSnapshot::cancel()
-{
-	goBack();
-    getParentByType<LLFloater>()->notify(LLSD().with("set-ready", true));
-}
-
-void LLPanelSnapshot::onCustomResolutionCommit()
-{
-	LLSD info;
-    std::string widthSpinnerName = getWidthSpinnerName();
-    std::string heightSpinnerName = getHeightSpinnerName();
-    llassert(!widthSpinnerName.empty() && !heightSpinnerName.empty());
-    LLSpinCtrl *widthSpinner = getChild<LLSpinCtrl>(widthSpinnerName);
-    LLSpinCtrl *heightSpinner = getChild<LLSpinCtrl>(heightSpinnerName);
-	if (getName() == "panel_snapshot_inventory")
-	{
-		S32 width = widthSpinner->getValue().asInteger();
-		width = power_of_two(width, MAX_TEXTURE_SIZE);
-		info["w"] = width;
-		widthSpinner->setIncrement(width >> 1);
-		widthSpinner->forceSetValue(width);
-		S32 height =  heightSpinner->getValue().asInteger();
-		height = power_of_two(height, MAX_TEXTURE_SIZE);
-		heightSpinner->setIncrement(height >> 1);
-		heightSpinner->forceSetValue(height);
-		info["h"] = height;
-	}
-	else
-	{
-		info["w"] = widthSpinner->getValue().asInteger();
-		info["h"] = heightSpinner->getValue().asInteger();
-	}
-    getParentByType<LLFloater>()->notify(LLSD().with("custom-res-change", info));
-}
-
-void LLPanelSnapshot::onResolutionComboCommit(LLUICtrl* ctrl)
-{
-	LLSD info;
-	info["combo-res-change"]["control-name"] = ctrl->getName();
-    getParentByType<LLFloater>()->notify(info);
-}
-
-void LLPanelSnapshot::onKeepAspectRatioCommit(LLUICtrl* ctrl)
-{
-    getParentByType<LLFloater>()->notify(LLSD().with("keep-aspect-change", ctrl->getValue().asBoolean()));
-}
-
-LLSnapshotModel::ESnapshotType LLPanelSnapshot::getSnapshotType()
-{
-	return LLSnapshotModel::SNAPSHOT_WEB;
-}
+/**

+ * @file llpanelsnapshot.cpp

+ * @brief Snapshot panel base class

+ *

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

+ */

+

+#include "llviewerprecompiledheaders.h"

+#include "llpanelsnapshot.h"

+

+// libs

+#include "llcombobox.h"

+#include "llfloater.h"

+#include "llfloatersnapshot.h"

+#include "llsliderctrl.h"

+#include "llspinctrl.h"

+#include "lltrans.h"

+

+// newview

+#include "llsidetraypanelcontainer.h"

+#include "llviewercontrol.h" // gSavedSettings

+

+#include "llagentbenefits.h"

+

+constexpr S32 MAX_TEXTURE_SIZE = 512 ; //max upload texture size 512 * 512

+

+S32 power_of_two(S32 sz, S32 upper)

+{

+    S32 res = upper;

+    while( upper >= sz)

+    {

+        res = upper;

+        upper >>= 1;

+    }

+    return res;

+}

+

+LLPanelSnapshot::LLPanelSnapshot()

+    : mSnapshotFloater(NULL)

+{}

+

+// virtual

+bool LLPanelSnapshot::postBuild()

+{

+    getChild<LLUICtrl>("save_btn")->setLabelArg("[UPLOAD_COST]", std::to_string(LLAgentBenefitsMgr::current().getTextureUploadCost()));

+    getChild<LLUICtrl>(getImageSizeComboName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onResolutionComboCommit, this, _1));

+    if (!getWidthSpinnerName().empty())

+    {

+        getChild<LLUICtrl>(getWidthSpinnerName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onCustomResolutionCommit, this));

+    }

+    if (!getHeightSpinnerName().empty())

+    {

+        getChild<LLUICtrl>(getHeightSpinnerName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onCustomResolutionCommit, this));

+    }

+    if (!getAspectRatioCBName().empty())

+    {

+        getChild<LLUICtrl>(getAspectRatioCBName())->setCommitCallback(boost::bind(&LLPanelSnapshot::onKeepAspectRatioCommit, this, _1));

+    }

+    updateControls(LLSD());

+

+    mSnapshotFloater = getParentByType<LLFloaterSnapshotBase>();

+    return true;

+}

+

+// virtual

+void LLPanelSnapshot::onOpen(const LLSD& key)

+{

+    S32 old_format = gSavedSettings.getS32("SnapshotFormat");

+    S32 new_format = (S32) getImageFormat();

+

+    gSavedSettings.setS32("SnapshotFormat", new_format);

+    setCtrlsEnabled(true);

+

+    // Switching panels will likely change image format.

+    // Not updating preview right away may lead to errors,

+    // e.g. attempt to send a large BMP image by email.

+    if (old_format != new_format)

+    {

+        getParentByType<LLFloater>()->notify(LLSD().with("image-format-change", true));

+    }

+}

+

+LLSnapshotModel::ESnapshotFormat LLPanelSnapshot::getImageFormat() const

+{

+    return LLSnapshotModel::SNAPSHOT_FORMAT_JPEG;

+}

+

+void LLPanelSnapshot::enableControls(bool enable)

+{

+    setCtrlsEnabled(enable);

+}

+

+LLSpinCtrl* LLPanelSnapshot::getWidthSpinner()

+{

+    llassert(!getWidthSpinnerName().empty());

+    return getChild<LLSpinCtrl>(getWidthSpinnerName());

+}

+

+LLSpinCtrl* LLPanelSnapshot::getHeightSpinner()

+{

+    llassert(!getHeightSpinnerName().empty());

+    return getChild<LLSpinCtrl>(getHeightSpinnerName());

+}

+

+S32 LLPanelSnapshot::getTypedPreviewWidth() const

+{

+    llassert(!getWidthSpinnerName().empty());

+    return getChild<LLUICtrl>(getWidthSpinnerName())->getValue().asInteger();

+}

+

+S32 LLPanelSnapshot::getTypedPreviewHeight() const

+{

+    llassert(!getHeightSpinnerName().empty());

+    return getChild<LLUICtrl>(getHeightSpinnerName())->getValue().asInteger();

+}

+

+void LLPanelSnapshot::enableAspectRatioCheckbox(bool enable)

+{

+    llassert(!getAspectRatioCBName().empty());

+    getChild<LLUICtrl>(getAspectRatioCBName())->setEnabled(enable);

+}

+

+LLSideTrayPanelContainer* LLPanelSnapshot::getParentContainer()

+{

+    LLSideTrayPanelContainer* parent = dynamic_cast<LLSideTrayPanelContainer*>(getParent());

+    if (!parent)

+    {

+        LL_WARNS() << "Cannot find panel container" << LL_ENDL;

+        return NULL;

+    }

+

+    return parent;

+}

+

+void LLPanelSnapshot::updateImageQualityLevel()

+{

+    LLSliderCtrl* quality_slider = getChild<LLSliderCtrl>("image_quality_slider");

+    S32 quality_val = llfloor((F32) quality_slider->getValue().asReal());

+

+    std::string quality_lvl;

+

+    if (quality_val < 20)

+    {

+        quality_lvl = LLTrans::getString("snapshot_quality_very_low");

+    }

+    else if (quality_val < 40)

+    {

+        quality_lvl = LLTrans::getString("snapshot_quality_low");

+    }

+    else if (quality_val < 60)

+    {

+        quality_lvl = LLTrans::getString("snapshot_quality_medium");

+    }

+    else if (quality_val < 80)

+    {

+        quality_lvl = LLTrans::getString("snapshot_quality_high");

+    }

+    else

+    {

+        quality_lvl = LLTrans::getString("snapshot_quality_very_high");

+    }

+

+    getChild<LLTextBox>("image_quality_level")->setTextArg("[QLVL]", quality_lvl);

+}

+

+void LLPanelSnapshot::goBack()

+{

+    LLSideTrayPanelContainer* parent = getParentContainer();

+    if (parent)

+    {

+        parent->openPreviousPanel();

+        parent->getCurrentPanel()->onOpen(LLSD());

+    }

+}

+

+void LLPanelSnapshot::cancel()

+{

+    goBack();

+    getParentByType<LLFloater>()->notify(LLSD().with("set-ready", true));

+}

+

+void LLPanelSnapshot::onCustomResolutionCommit()

+{

+    LLSD info;

+    std::string widthSpinnerName = getWidthSpinnerName();

+    std::string heightSpinnerName = getHeightSpinnerName();

+    llassert(!widthSpinnerName.empty() && !heightSpinnerName.empty());

+    LLSpinCtrl *widthSpinner = getChild<LLSpinCtrl>(widthSpinnerName);

+    LLSpinCtrl *heightSpinner = getChild<LLSpinCtrl>(heightSpinnerName);

+    if (getName() == "panel_snapshot_inventory")

+    {

+        S32 width = widthSpinner->getValue().asInteger();

+        width = power_of_two(width, MAX_TEXTURE_SIZE);

+        info["w"] = width;

+        widthSpinner->setIncrement(width >> 1);

+        widthSpinner->forceSetValue(width);

+        S32 height =  heightSpinner->getValue().asInteger();

+        height = power_of_two(height, MAX_TEXTURE_SIZE);

+        heightSpinner->setIncrement(height >> 1);

+        heightSpinner->forceSetValue(height);

+        info["h"] = height;

+    }

+    else

+    {

+        info["w"] = widthSpinner->getValue().asInteger();

+        info["h"] = heightSpinner->getValue().asInteger();

+    }

+    getParentByType<LLFloater>()->notify(LLSD().with("custom-res-change", info));

+}

+

+void LLPanelSnapshot::onResolutionComboCommit(LLUICtrl* ctrl)

+{

+    LLSD info;

+    info["combo-res-change"]["control-name"] = ctrl->getName();

+    getParentByType<LLFloater>()->notify(info);

+}

+

+void LLPanelSnapshot::onKeepAspectRatioCommit(LLUICtrl* ctrl)

+{

+    getParentByType<LLFloater>()->notify(LLSD().with("keep-aspect-change", ctrl->getValue().asBoolean()));

+}

+

+LLSnapshotModel::ESnapshotType LLPanelSnapshot::getSnapshotType()

+{

+    return LLSnapshotModel::SNAPSHOT_WEB;

+}