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

diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp
index 00085549ad..be5563ca21 100644
--- a/indra/newview/llpanelpresetspulldown.cpp
+++ b/indra/newview/llpanelpresetspulldown.cpp
@@ -1,171 +1,171 @@
-/** 
- * @file llpanelpresetspulldown.cpp
- * @brief A panel showing a quick way to pick presets
- *
- * $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 "llpanelpresetspulldown.h"
-
-#include "llviewercontrol.h"
-#include "llstatusbar.h"
-
-#include "llbutton.h"
-#include "lltabcontainer.h"
-#include "llfloater.h"
-#include "llfloaterperformance.h"
-#include "llfloaterreg.h"
-#include "llpresetsmanager.h"
-#include "llsliderctrl.h"
-#include "llscrolllistctrl.h"
-#include "lltrans.h"
-
-///----------------------------------------------------------------------------
-/// Class LLPanelPresetsPulldown
-///----------------------------------------------------------------------------
-
-// Default constructor
-LLPanelPresetsPulldown::LLPanelPresetsPulldown()
-{
-	mHoverTimer.stop();
-
-	mCommitCallbackRegistrar.add("Presets.GoGraphicsPrefs", boost::bind(&LLPanelPresetsPulldown::onGraphicsButtonClick, this, _2));
-    mCommitCallbackRegistrar.add("Presets.GoAutofpsPrefs", boost::bind(&LLPanelPresetsPulldown::onAutofpsButtonClick, this, _2));
-	mCommitCallbackRegistrar.add("Presets.RowClick", boost::bind(&LLPanelPresetsPulldown::onRowClick, this, _2));
-
-	buildFromFile( "panel_presets_pulldown.xml");
-}
-
-bool LLPanelPresetsPulldown::postBuild()
-{
-	LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();
-    presetsMgr->setPresetListChangeCallback(boost::bind(&LLPanelPresetsPulldown::populatePanel, this));
-	// Make sure there is a default preference file
-    presetsMgr->createMissingDefault(PRESETS_GRAPHIC);
-
-	populatePanel();
-
-	return LLPanelPulldown::postBuild();
-}
-
-void LLPanelPresetsPulldown::populatePanel()
-{
-	LLPresetsManager::getInstance()->loadPresetNamesFromDir(PRESETS_GRAPHIC, mPresetNames, DEFAULT_TOP);
-
-	LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
-
-	if (scroll && mPresetNames.begin() != mPresetNames.end())
-	{
-		scroll->clearRows();
-
-		std::string active_preset = gSavedSettings.getString("PresetGraphicActive");
-		if (active_preset == PRESETS_DEFAULT)
-		{
-			active_preset = LLTrans::getString(PRESETS_DEFAULT);
-		}
-
-		for (std::list<std::string>::const_iterator it = mPresetNames.begin(); it != mPresetNames.end(); ++it)
-		{
-			const std::string& name = *it;
-            LL_DEBUGS() << "adding '" << name << "'" << LL_ENDL;
-            
-			LLSD row;
-			row["columns"][0]["column"] = "preset_name";
-			row["columns"][0]["value"] = name;
-
-			bool is_selected_preset = false;
-			if (name == active_preset)
-			{
-				row["columns"][1]["column"] = "icon";
-				row["columns"][1]["type"] = "icon";
-				row["columns"][1]["value"] = "Check_Mark";
-
-				is_selected_preset = true;
-			}
-
-			LLScrollListItem* new_item = scroll->addElement(row);
-			new_item->setSelected(is_selected_preset);
-		}
-	}
-}
-
-void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data)
-{
-	LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");
-
-	if (scroll)
-	{
-		LLScrollListItem* item = scroll->getFirstSelected();
-		if (item)
-		{
-			std::string name = item->getColumn(1)->getValue().asString();
-
-            LL_DEBUGS() << "selected '" << name << "'" << LL_ENDL;
-			LLPresetsManager::getInstance()->loadPreset(PRESETS_GRAPHIC, name);
-
-            // Scroll grabbed focus, drop it to prevent selection of parent menu
-            setFocus(false);
-
-			setVisible(false);
-		}
-        else
-        {
-            LL_DEBUGS() << "none selected" << LL_ENDL;
-        }
-	}
-    else
-    {
-        LL_DEBUGS() << "no scroll" << LL_ENDL;
-    }
-}
-
-void LLPanelPresetsPulldown::onGraphicsButtonClick(const LLSD& user_data)
-{
-	// close the minicontrol, we're bringing up the big one
-	setVisible(false);
-
-	// bring up the prefs floater
-	LLFloater* prefsfloater = LLFloaterReg::showInstance("preferences");
-	if (prefsfloater)
-	{
-		// grab the 'graphics' panel from the preferences floater and
-		// bring it the front!
-		LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
-		LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("display");
-		if (tabcontainer && graphicspanel)
-		{
-			tabcontainer->selectTabPanel(graphicspanel);
-		}
-	}
-}
-
-void LLPanelPresetsPulldown::onAutofpsButtonClick(const LLSD& user_data)
-{
-    setVisible(false);
-    LLFloaterPerformance* performance_floater = LLFloaterReg::showTypedInstance<LLFloaterPerformance>("performance");
-    if (performance_floater)
-    {
-        performance_floater->showAutoadjustmentsPanel();
-    }
-}
+/**

+ * @file llpanelpresetspulldown.cpp

+ * @brief A panel showing a quick way to pick presets

+ *

+ * $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 "llpanelpresetspulldown.h"

+

+#include "llviewercontrol.h"

+#include "llstatusbar.h"

+

+#include "llbutton.h"

+#include "lltabcontainer.h"

+#include "llfloater.h"

+#include "llfloaterperformance.h"

+#include "llfloaterreg.h"

+#include "llpresetsmanager.h"

+#include "llsliderctrl.h"

+#include "llscrolllistctrl.h"

+#include "lltrans.h"

+

+///----------------------------------------------------------------------------

+/// Class LLPanelPresetsPulldown

+///----------------------------------------------------------------------------

+

+// Default constructor

+LLPanelPresetsPulldown::LLPanelPresetsPulldown()

+{

+    mHoverTimer.stop();

+

+    mCommitCallbackRegistrar.add("Presets.GoGraphicsPrefs", boost::bind(&LLPanelPresetsPulldown::onGraphicsButtonClick, this, _2));

+    mCommitCallbackRegistrar.add("Presets.GoAutofpsPrefs", boost::bind(&LLPanelPresetsPulldown::onAutofpsButtonClick, this, _2));

+    mCommitCallbackRegistrar.add("Presets.RowClick", boost::bind(&LLPanelPresetsPulldown::onRowClick, this, _2));

+

+    buildFromFile( "panel_presets_pulldown.xml");

+}

+

+bool LLPanelPresetsPulldown::postBuild()

+{

+    LLPresetsManager* presetsMgr = LLPresetsManager::getInstance();

+    presetsMgr->setPresetListChangeCallback(boost::bind(&LLPanelPresetsPulldown::populatePanel, this));

+    // Make sure there is a default preference file

+    presetsMgr->createMissingDefault(PRESETS_GRAPHIC);

+

+    populatePanel();

+

+    return LLPanelPulldown::postBuild();

+}

+

+void LLPanelPresetsPulldown::populatePanel()

+{

+    LLPresetsManager::getInstance()->loadPresetNamesFromDir(PRESETS_GRAPHIC, mPresetNames, DEFAULT_TOP);

+

+    LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");

+

+    if (scroll && mPresetNames.begin() != mPresetNames.end())

+    {

+        scroll->clearRows();

+

+        std::string active_preset = gSavedSettings.getString("PresetGraphicActive");

+        if (active_preset == PRESETS_DEFAULT)

+        {

+            active_preset = LLTrans::getString(PRESETS_DEFAULT);

+        }

+

+        for (std::list<std::string>::const_iterator it = mPresetNames.begin(); it != mPresetNames.end(); ++it)

+        {

+            const std::string& name = *it;

+            LL_DEBUGS() << "adding '" << name << "'" << LL_ENDL;

+

+            LLSD row;

+            row["columns"][0]["column"] = "preset_name";

+            row["columns"][0]["value"] = name;

+

+            bool is_selected_preset = false;

+            if (name == active_preset)

+            {

+                row["columns"][1]["column"] = "icon";

+                row["columns"][1]["type"] = "icon";

+                row["columns"][1]["value"] = "Check_Mark";

+

+                is_selected_preset = true;

+            }

+

+            LLScrollListItem* new_item = scroll->addElement(row);

+            new_item->setSelected(is_selected_preset);

+        }

+    }

+}

+

+void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data)

+{

+    LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("preset_list");

+

+    if (scroll)

+    {

+        LLScrollListItem* item = scroll->getFirstSelected();

+        if (item)

+        {

+            std::string name = item->getColumn(1)->getValue().asString();

+

+            LL_DEBUGS() << "selected '" << name << "'" << LL_ENDL;

+            LLPresetsManager::getInstance()->loadPreset(PRESETS_GRAPHIC, name);

+

+            // Scroll grabbed focus, drop it to prevent selection of parent menu

+            setFocus(false);

+

+            setVisible(false);

+        }

+        else

+        {

+            LL_DEBUGS() << "none selected" << LL_ENDL;

+        }

+    }

+    else

+    {

+        LL_DEBUGS() << "no scroll" << LL_ENDL;

+    }

+}

+

+void LLPanelPresetsPulldown::onGraphicsButtonClick(const LLSD& user_data)

+{

+    // close the minicontrol, we're bringing up the big one

+    setVisible(false);

+

+    // bring up the prefs floater

+    LLFloater* prefsfloater = LLFloaterReg::showInstance("preferences");

+    if (prefsfloater)

+    {

+        // grab the 'graphics' panel from the preferences floater and

+        // bring it the front!

+        LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");

+        LLPanel* graphicspanel = prefsfloater->getChild<LLPanel>("display");

+        if (tabcontainer && graphicspanel)

+        {

+            tabcontainer->selectTabPanel(graphicspanel);

+        }

+    }

+}

+

+void LLPanelPresetsPulldown::onAutofpsButtonClick(const LLSD& user_data)

+{

+    setVisible(false);

+    LLFloaterPerformance* performance_floater = LLFloaterReg::showTypedInstance<LLFloaterPerformance>("performance");

+    if (performance_floater)

+    {

+        performance_floater->showAutoadjustmentsPanel();

+    }

+}