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/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
index a7aca8a957..b08cd0c1cb 100644
--- a/indra/newview/llpanelvolumepulldown.cpp
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -1,117 +1,117 @@
-/** 
- * @file llpanelvolumepulldown.cpp
- * @author Tofu Linden
- * @brief A floater showing the master volume pull-down
- *
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, 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 "llpanelvolumepulldown.h"
-
-// Viewer libs
-#include "llviewercontrol.h"
-#include "llstatusbar.h"
-
-// Linden libs
-#include "llbutton.h"
-#include "llcheckboxctrl.h"
-#include "lltabcontainer.h"
-#include "llfloaterreg.h"
-#include "llfloaterpreference.h"
-#include "llsliderctrl.h"
-
-///----------------------------------------------------------------------------
-/// Class LLPanelVolumePulldown
-///----------------------------------------------------------------------------
-
-// Default constructor
-LLPanelVolumePulldown::LLPanelVolumePulldown()
-{
-	mCommitCallbackRegistrar.add("Vol.setControlFalse", boost::bind(&LLPanelVolumePulldown::setControlFalse, this, _2));
-	mCommitCallbackRegistrar.add("Vol.SetSounds", boost::bind(&LLPanelVolumePulldown::onClickSetSounds, this));
-	mCommitCallbackRegistrar.add("Vol.updateCheckbox",	boost::bind(&LLPanelVolumePulldown::updateCheckbox, this, _1, _2));
-	mCommitCallbackRegistrar.add("Vol.GoAudioPrefs", boost::bind(&LLPanelVolumePulldown::onAdvancedButtonClick, this, _2));
-	buildFromFile( "panel_volume_pulldown.xml");
-}
-
-bool LLPanelVolumePulldown::postBuild()
-{
-	return LLPanelPulldown::postBuild();
-}
-
-void LLPanelVolumePulldown::onAdvancedButtonClick(const LLSD& user_data)
-{
-	// close the global volume minicontrol, we're bringing up the big one
-	setVisible(false);
-
-	// bring up the prefs floater
-	LLFloaterPreference* prefsfloater = dynamic_cast<LLFloaterPreference*>
-		(LLFloaterReg::showInstance("preferences"));
-	if (prefsfloater)
-	{
-		// grab the 'audio' panel from the preferences floater and
-		// bring it the front!
-		LLTabContainer* tabcontainer = prefsfloater->getChild<LLTabContainer>("pref core");
-		LLPanel* audiopanel = prefsfloater->getChild<LLPanel>("audio");
-		if (tabcontainer && audiopanel)
-		{
-			tabcontainer->selectTabPanel(audiopanel);
-		}
-	}
-}
-
-void LLPanelVolumePulldown::setControlFalse(const LLSD& user_data)
-{
-	std::string control_name = user_data.asString();
-	LLControlVariable* control = findControl(control_name);
-	
-	if (control)
-		control->set(LLSD(false));
-}
-
-void LLPanelVolumePulldown::updateCheckbox(LLUICtrl* ctrl, const LLSD& user_data)
-{
-    std::string control_name = user_data.asString();
-    if (control_name == "MediaAutoPlay")
-    {
-        std::string name = ctrl->getName();
-
-        // Disable "Allow Media to auto play" only when both
-        // "Streaming Music" and "Media" are unchecked. STORM-513.
-        if ((name == "enable_music") || (name == "enable_media"))
-        {
-            bool music_enabled = getChild<LLCheckBoxCtrl>("enable_music")->get();
-            bool media_enabled = getChild<LLCheckBoxCtrl>("enable_media")->get();
-
-            getChild<LLCheckBoxCtrl>("media_auto_play_combo")->setEnabled(music_enabled || media_enabled);
-        }
-    }
-}
-
-void LLPanelVolumePulldown::onClickSetSounds()
-{
-	// Disable Enable gesture sounds checkbox if the master sound is disabled 
-	// or if sound effects are disabled.
-	getChild<LLCheckBoxCtrl>("gesture_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds"));
-}
+/**

+ * @file llpanelvolumepulldown.cpp

+ * @author Tofu Linden

+ * @brief A floater showing the master volume pull-down

+ *

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

+ * Second Life Viewer Source Code

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

+

+// Viewer libs

+#include "llviewercontrol.h"

+#include "llstatusbar.h"

+

+// Linden libs

+#include "llbutton.h"

+#include "llcheckboxctrl.h"

+#include "lltabcontainer.h"

+#include "llfloaterreg.h"

+#include "llfloaterpreference.h"

+#include "llsliderctrl.h"

+

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

+/// Class LLPanelVolumePulldown

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

+

+// Default constructor

+LLPanelVolumePulldown::LLPanelVolumePulldown()

+{

+    mCommitCallbackRegistrar.add("Vol.setControlFalse", boost::bind(&LLPanelVolumePulldown::setControlFalse, this, _2));

+    mCommitCallbackRegistrar.add("Vol.SetSounds", boost::bind(&LLPanelVolumePulldown::onClickSetSounds, this));

+    mCommitCallbackRegistrar.add("Vol.updateCheckbox",  boost::bind(&LLPanelVolumePulldown::updateCheckbox, this, _1, _2));

+    mCommitCallbackRegistrar.add("Vol.GoAudioPrefs", boost::bind(&LLPanelVolumePulldown::onAdvancedButtonClick, this, _2));

+    buildFromFile( "panel_volume_pulldown.xml");

+}

+

+bool LLPanelVolumePulldown::postBuild()

+{

+    return LLPanelPulldown::postBuild();

+}

+

+void LLPanelVolumePulldown::onAdvancedButtonClick(const LLSD& user_data)

+{

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

+    setVisible(false);

+

+    // bring up the prefs floater

+    LLFloaterPreference* prefsfloater = dynamic_cast<LLFloaterPreference*>

+        (LLFloaterReg::showInstance("preferences"));

+    if (prefsfloater)

+    {

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

+        // bring it the front!

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

+        LLPanel* audiopanel = prefsfloater->getChild<LLPanel>("audio");

+        if (tabcontainer && audiopanel)

+        {

+            tabcontainer->selectTabPanel(audiopanel);

+        }

+    }

+}

+

+void LLPanelVolumePulldown::setControlFalse(const LLSD& user_data)

+{

+    std::string control_name = user_data.asString();

+    LLControlVariable* control = findControl(control_name);

+

+    if (control)

+        control->set(LLSD(false));

+}

+

+void LLPanelVolumePulldown::updateCheckbox(LLUICtrl* ctrl, const LLSD& user_data)

+{

+    std::string control_name = user_data.asString();

+    if (control_name == "MediaAutoPlay")

+    {

+        std::string name = ctrl->getName();

+

+        // Disable "Allow Media to auto play" only when both

+        // "Streaming Music" and "Media" are unchecked. STORM-513.

+        if ((name == "enable_music") || (name == "enable_media"))

+        {

+            bool music_enabled = getChild<LLCheckBoxCtrl>("enable_music")->get();

+            bool media_enabled = getChild<LLCheckBoxCtrl>("enable_media")->get();

+

+            getChild<LLCheckBoxCtrl>("media_auto_play_combo")->setEnabled(music_enabled || media_enabled);

+        }

+    }

+}

+

+void LLPanelVolumePulldown::onClickSetSounds()

+{

+    // Disable Enable gesture sounds checkbox if the master sound is disabled

+    // or if sound effects are disabled.

+    getChild<LLCheckBoxCtrl>("gesture_audio_play_btn")->setEnabled(!gSavedSettings.getBOOL("MuteSounds"));

+}