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

diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp
index ce16056700..fa62df1ffc 100644
--- a/indra/newview/llfloatersaveprefpreset.cpp
+++ b/indra/newview/llfloatersaveprefpreset.cpp
@@ -1,115 +1,115 @@
-/** 
- * @file llfloatersaveprefpreset.cpp
- * @brief Floater to save a graphics 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 "llfloatersaveprefpreset.h"
-
-#include "llbutton.h"
-#include "llcombobox.h"
-#include "llfloaterpreference.h"
-#include "llfloaterreg.h"
-#include "llnotificationsutil.h"
-#include "llpresetsmanager.h"
-#include "lltrans.h"
-
-LLFloaterSavePrefPreset::LLFloaterSavePrefPreset(const LLSD &key)
-	: LLFloater(key)
-{
-}
-
-// virtual
-bool LLFloaterSavePrefPreset::postBuild()
-{
-	LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
-	if (preferences)
-	{
-		preferences->addDependentFloater(this);
-	}
-	
-	getChild<LLComboBox>("preset_combo")->setTextEntryCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
-	getChild<LLComboBox>("preset_combo")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));
-	getChild<LLButton>("save")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnSave, this));
-
-	getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnCancel, this));
-
-	LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetsListChange, this));
-	
-	mSaveButton = getChild<LLButton>("save");
-	mPresetCombo = getChild<LLComboBox>("preset_combo");
-
-	return true;
-}
-
-void LLFloaterSavePrefPreset::onPresetNameEdited()
-{
-	// Disable saving a preset having empty name.
-	std::string name = mPresetCombo->getSimple();
-
-	mSaveButton->setEnabled(!name.empty());
-}
-
-void LLFloaterSavePrefPreset::onOpen(const LLSD& key)
-{
-	mSubdirectory = key.asString();
-
-	EDefaultOptions option = DEFAULT_HIDE;
-	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option);
-
-	onPresetNameEdited();
-}
-
-void LLFloaterSavePrefPreset::onBtnSave()
-{
-	std::string name = mPresetCombo->getSimple();
-
-	std::string upper_name(name);
-	LLStringUtil::toUpper(upper_name);
-
-	if ((name == LLTrans::getString(PRESETS_DEFAULT)) || (upper_name == PRESETS_DEFAULT_UPPER))
-	{
-		LLNotificationsUtil::add("DefaultPresetNotSaved");
-	}
-	else if (!LLPresetsManager::getInstance()->savePreset(mSubdirectory, name))
-	{
-		LLSD args;
-		args["NAME"] = name;
-		LLNotificationsUtil::add("PresetNotSaved", args);
-	}
-
-	closeFloater();
-}
-
-void LLFloaterSavePrefPreset::onPresetsListChange()
-{
-	EDefaultOptions option = DEFAULT_HIDE;
-	LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option);
-}
-
-void LLFloaterSavePrefPreset::onBtnCancel()
-{
-	closeFloater();
-}
+/**

+ * @file llfloatersaveprefpreset.cpp

+ * @brief Floater to save a graphics 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 "llfloatersaveprefpreset.h"

+

+#include "llbutton.h"

+#include "llcombobox.h"

+#include "llfloaterpreference.h"

+#include "llfloaterreg.h"

+#include "llnotificationsutil.h"

+#include "llpresetsmanager.h"

+#include "lltrans.h"

+

+LLFloaterSavePrefPreset::LLFloaterSavePrefPreset(const LLSD &key)

+    : LLFloater(key)

+{

+}

+

+// virtual

+bool LLFloaterSavePrefPreset::postBuild()

+{

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

+    if (preferences)

+    {

+        preferences->addDependentFloater(this);

+    }

+

+    getChild<LLComboBox>("preset_combo")->setTextEntryCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));

+    getChild<LLComboBox>("preset_combo")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onPresetNameEdited, this));

+    getChild<LLButton>("save")->setCommitCallback(boost::bind(&LLFloaterSavePrefPreset::onBtnSave, this));

+

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

+

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

+

+    mSaveButton = getChild<LLButton>("save");

+    mPresetCombo = getChild<LLComboBox>("preset_combo");

+

+    return true;

+}

+

+void LLFloaterSavePrefPreset::onPresetNameEdited()

+{

+    // Disable saving a preset having empty name.

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

+

+    mSaveButton->setEnabled(!name.empty());

+}

+

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

+{

+    mSubdirectory = key.asString();

+

+    EDefaultOptions option = DEFAULT_HIDE;

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

+

+    onPresetNameEdited();

+}

+

+void LLFloaterSavePrefPreset::onBtnSave()

+{

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

+

+    std::string upper_name(name);

+    LLStringUtil::toUpper(upper_name);

+

+    if ((name == LLTrans::getString(PRESETS_DEFAULT)) || (upper_name == PRESETS_DEFAULT_UPPER))

+    {

+        LLNotificationsUtil::add("DefaultPresetNotSaved");

+    }

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

+    {

+        LLSD args;

+        args["NAME"] = name;

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

+    }

+

+    closeFloater();

+}

+

+void LLFloaterSavePrefPreset::onPresetsListChange()

+{

+    EDefaultOptions option = DEFAULT_HIDE;

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

+}

+

+void LLFloaterSavePrefPreset::onBtnCancel()

+{

+    closeFloater();

+}