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

diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp
index 46fd1c5288..4f3c2485cf 100644
--- a/indra/newview/llfloaterdeleteprefpreset.cpp
+++ b/indra/newview/llfloaterdeleteprefpreset.cpp
@@ -1,117 +1,117 @@
-/** 
- * @file llfloaterdeleteprefpreset.cpp
- * @brief Floater to delete a graphics / camera preset
- *
- * $LicenseInfo:firstyear=2014&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2014, 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 "llfloaterdeleteprefpreset.h"
-
-#include "llbutton.h"
-#include "llcombobox.h"
-#include "llfloaterpreference.h"
-#include "llnotificationsutil.h"
-#include "llpresetsmanager.h"
-#include "llviewercontrol.h"
-#include "llfloaterreg.h"
-
-LLFloaterDeletePrefPreset::LLFloaterDeletePrefPreset(const LLSD &key)
-:	LLFloater(key)
-{
-}
-
-// virtual
-bool LLFloaterDeletePrefPreset::postBuild()
-{
-	LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
-	if (preferences)
-	{
-		preferences->addDependentFloater(this);
-	}
-	getChild<LLButton>("delete")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnDelete, this));
-	getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnCancel, this));
-	LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterDeletePrefPreset::onPresetsListChange, this));
-
-	return true;
-}
-
-void LLFloaterDeletePrefPreset::onOpen(const LLSD& key)
-{
-	mSubdirectory = key.asString();
-	std::string title_type = std::string("title_") + mSubdirectory;
-    if (hasString(title_type))
-    {
-        std::string floater_title = getString(title_type);
-        setTitle(floater_title);
-    }
-    else
-    {
-        LL_WARNS() << title_type << " not found" << LL_ENDL;
-        setTitle(title_type);
-    }
-
-	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
-	EDefaultOptions option = DEFAULT_HIDE;
-	bool action;
-	action = LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
-
-	LLButton* delete_btn = getChild<LLButton>("delete");
-	delete_btn->setEnabled(action);
-}
-
-void LLFloaterDeletePrefPreset::onBtnDelete()
-{
-	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
-	std::string name = combo->getSimple();
-
-	if (!LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
-	{
-		LLSD args;
-		args["NAME"] = name;
-		LLNotificationsUtil::add("PresetNotDeleted", args);
-	}
-	else if (mSubdirectory == PRESETS_CAMERA)
-	{
-		if (gSavedSettings.getString("PresetCameraActive") == name)
-		{
-			gSavedSettings.setString("PresetCameraActive", "");
-		}
-	}
-
-	closeFloater();
-}
-
-void LLFloaterDeletePrefPreset::onPresetsListChange()
-{
-	LLComboBox* combo = getChild<LLComboBox>("preset_combo");
-
-	EDefaultOptions option = DEFAULT_HIDE;
-
-	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
-}
-
-void LLFloaterDeletePrefPreset::onBtnCancel()
-{
-	closeFloater();
-}
+/**

+ * @file llfloaterdeleteprefpreset.cpp

+ * @brief Floater to delete a graphics / camera preset

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2014, 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 "llfloaterdeleteprefpreset.h"

+

+#include "llbutton.h"

+#include "llcombobox.h"

+#include "llfloaterpreference.h"

+#include "llnotificationsutil.h"

+#include "llpresetsmanager.h"

+#include "llviewercontrol.h"

+#include "llfloaterreg.h"

+

+LLFloaterDeletePrefPreset::LLFloaterDeletePrefPreset(const LLSD &key)

+:   LLFloater(key)

+{

+}

+

+// virtual

+bool LLFloaterDeletePrefPreset::postBuild()

+{

+    LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");

+    if (preferences)

+    {

+        preferences->addDependentFloater(this);

+    }

+    getChild<LLButton>("delete")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnDelete, this));

+    getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnCancel, this));

+    LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterDeletePrefPreset::onPresetsListChange, this));

+

+    return true;

+}

+

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

+{

+    mSubdirectory = key.asString();

+    std::string title_type = std::string("title_") + mSubdirectory;

+    if (hasString(title_type))

+    {

+        std::string floater_title = getString(title_type);

+        setTitle(floater_title);

+    }

+    else

+    {

+        LL_WARNS() << title_type << " not found" << LL_ENDL;

+        setTitle(title_type);

+    }

+

+    LLComboBox* combo = getChild<LLComboBox>("preset_combo");

+    EDefaultOptions option = DEFAULT_HIDE;

+    bool action;

+    action = LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);

+

+    LLButton* delete_btn = getChild<LLButton>("delete");

+    delete_btn->setEnabled(action);

+}

+

+void LLFloaterDeletePrefPreset::onBtnDelete()

+{

+    LLComboBox* combo = getChild<LLComboBox>("preset_combo");

+    std::string name = combo->getSimple();

+

+    if (!LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))

+    {

+        LLSD args;

+        args["NAME"] = name;

+        LLNotificationsUtil::add("PresetNotDeleted", args);

+    }

+    else if (mSubdirectory == PRESETS_CAMERA)

+    {

+        if (gSavedSettings.getString("PresetCameraActive") == name)

+        {

+            gSavedSettings.setString("PresetCameraActive", "");

+        }

+    }

+

+    closeFloater();

+}

+

+void LLFloaterDeletePrefPreset::onPresetsListChange()

+{

+    LLComboBox* combo = getChild<LLComboBox>("preset_combo");

+

+    EDefaultOptions option = DEFAULT_HIDE;

+

+    LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);

+}

+

+void LLFloaterDeletePrefPreset::onBtnCancel()

+{

+    closeFloater();

+}